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
commit 95875c92a68a774a13f6a6eae8d41e892dd7f76e
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Tue Jul 8 10:05:46 2025 +0100
Moving WSEncryptionPart into API
---
.../java/org/apache/wss4j/api/dom/SignatureEncryptionActionToken.java | 1 -
.../src/main/java/org/apache/wss4j/api/dom}/WSEncryptionPart.java | 2 +-
.../src/main/java/org/apache/wss4j/api/dom/message/WSSecBase.java | 2 +-
.../src/main/java/org/apache/wss4j/api/dom/message/WSSecSignature.java | 2 +-
.../main/java/org/apache/wss4j/api/dom/message/WSSecSignatureBase.java | 2 +-
.../main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/action/SignatureAction.java | 2 +-
.../java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java | 2 +-
.../main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java | 2 +-
.../java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/handler/WSHandler.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/message/Encryptor.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java | 2 +-
.../test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java | 2 +-
.../java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/message/ReplayTest.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java | 2 +-
.../test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/message/SignatureTest.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java | 2 +-
.../test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java | 2 +-
.../java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java | 2 +-
.../java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java | 2 +-
.../java/org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java | 2 +-
.../test/java/org/apache/wss4j/common/saml/dom/SamlReferenceTest.java | 2 +-
.../org/apache/wss4j/common/saml/dom/SamlTokenCustomSignatureTest.java | 2 +-
.../java/org/apache/wss4j/common/saml/dom/SamlTokenDerivedTest.java | 2 +-
.../test/java/org/apache/wss4j/common/saml/dom/SignaturePartsTest.java | 2 +-
.../src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java | 2 +-
.../src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java | 2 +-
.../test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java | 2 +-
.../src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java | 2 +-
.../java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java | 2 +-
.../test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java | 2 +-
44 files changed, 43 insertions(+), 44 deletions(-)
diff --git
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SignatureEncryptionActionToken.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SignatureEncryptionActionToken.java
index ca1d611c0..228199efd 100644
---
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SignatureEncryptionActionToken.java
+++
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SignatureEncryptionActionToken.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.wss4j.common.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git
a/ws-security-common/src/main/java/org/apache/wss4j/common/WSEncryptionPart.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/WSEncryptionPart.java
similarity index 99%
rename from
ws-security-common/src/main/java/org/apache/wss4j/common/WSEncryptionPart.java
rename to
ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/WSEncryptionPart.java
index 4c063c03d..4c00e8210 100644
---
a/ws-security-common/src/main/java/org/apache/wss4j/common/WSEncryptionPart.java
+++
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/WSEncryptionPart.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.common;
+package org.apache.wss4j.api.dom;
import java.util.Collections;
import java.util.List;
diff --git
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecBase.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecBase.java
index 21dd37654..e498d5744 100644
---
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecBase.java
+++
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecBase.java
@@ -19,7 +19,7 @@
package org.apache.wss4j.api.dom.message;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.callback.CallbackLookup;
import org.apache.wss4j.api.dom.callback.DOMCallbackLookup;
import org.apache.wss4j.common.util.XMLUtils;
diff --git
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecSignature.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecSignature.java
index d94065d39..301bed9d9 100644
---
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecSignature.java
+++
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecSignature.java
@@ -43,7 +43,7 @@ import javax.xml.crypto.dsig.keyinfo.KeyValue;
import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
import javax.xml.crypto.dsig.spec.ExcC14NParameterSpec;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.WSS4JConstants;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoType;
diff --git
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecSignatureBase.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecSignatureBase.java
index 1970d6459..4cf1147d4 100644
---
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecSignatureBase.java
+++
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecSignatureBase.java
@@ -35,7 +35,7 @@ import javax.xml.crypto.dsig.XMLSignatureFactory;
import javax.xml.crypto.dsig.spec.ExcC14NParameterSpec;
import javax.xml.crypto.dsig.spec.TransformParameterSpec;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.api.dom.callback.DOMCallbackLookup;
import org.apache.wss4j.common.ext.Attachment;
import org.apache.wss4j.common.ext.AttachmentRequestCallback;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java
index e0df9d022..bdc8c7c58 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java
@@ -28,7 +28,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.apache.wss4j.api.dom.EncryptionActionToken;
import org.apache.wss4j.api.dom.SecurityActionToken;
import org.apache.wss4j.api.dom.SignatureActionToken;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.derivedKey.ConversationConstants;
import org.apache.wss4j.common.ext.WSPasswordCallback;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
index fa7c842d0..43c8eab9b 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
@@ -26,7 +26,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.apache.wss4j.api.dom.SecurityActionToken;
import org.apache.wss4j.api.dom.SignatureActionToken;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.ext.WSPasswordCallback;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.dom.WSConstants;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java
index 6fb1629bd..3b0843dae 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java
@@ -23,7 +23,7 @@ import org.apache.wss4j.api.dom.WSConstants;
import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.api.dom.SecurityActionToken;
import org.apache.wss4j.api.dom.SignatureActionToken;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.dom.RequestData;
import org.apache.wss4j.api.dom.action.Action;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java
index 3034e440d..4c7087028 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java
@@ -28,7 +28,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.apache.wss4j.api.dom.EncryptionActionToken;
import org.apache.wss4j.api.dom.SecurityActionToken;
import org.apache.wss4j.api.dom.SignatureActionToken;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.derivedKey.ConversationConstants;
import org.apache.wss4j.common.ext.WSPasswordCallback;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java
index 21069b914..c1e68d520 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java
@@ -28,7 +28,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.apache.wss4j.api.dom.WSConstants;
import org.apache.wss4j.api.dom.SecurityActionToken;
import org.apache.wss4j.api.dom.SignatureActionToken;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.ext.WSPasswordCallback;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.UsernameTokenUtil;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
index 354e1f28f..06906124f 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
@@ -36,7 +36,7 @@ import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.api.dom.EncryptionActionToken;
import org.apache.wss4j.api.dom.SignatureActionToken;
import org.apache.wss4j.api.dom.SignatureEncryptionActionToken;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.AlgorithmSuite;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
index 0c8e48253..5832ca16b 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
@@ -34,7 +34,7 @@ import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.callback.CallbackLookup;
import org.apache.wss4j.api.dom.callback.DOMCallbackLookup;
import org.apache.wss4j.api.dom.message.WSSecHeader;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
index af742b5a6..e0927d1ca 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
@@ -24,7 +24,7 @@ import java.util.List;
import javax.crypto.SecretKey;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.derivedKey.ConversationConstants;
import org.apache.wss4j.api.dom.message.WSSecHeader;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java
index 69c478c49..0b81d9745 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java
@@ -40,7 +40,7 @@ import javax.xml.crypto.dsig.spec.ExcC14NParameterSpec;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.derivedKey.ConversationConstants;
import org.apache.wss4j.api.dom.message.WSSecHeader;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
index 3ea052bd3..70eacbf5f 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
@@ -27,7 +27,7 @@ import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
import javax.security.auth.DestroyFailedException;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.api.dom.message.WSSecHeader;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
index a9802dac7..7c46365be 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
@@ -21,7 +21,7 @@ package org.apache.wss4j.dom.util;
import org.apache.wss4j.api.dom.WSConstants;
import org.apache.wss4j.api.dom.engine.WSSConfig;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.AttachmentUtils;
import org.apache.wss4j.common.util.XMLUtils;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java
index ba56c2ce2..568e57603 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java
@@ -30,7 +30,7 @@ import javax.xml.crypto.dsig.SignatureMethod;
import org.apache.wss4j.api.dom.EncryptionActionToken;
import org.apache.wss4j.api.dom.SignatureActionToken;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java
index 17d67eae9..43e000217 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java
@@ -38,7 +38,7 @@ import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.api.dom.message.WSSecHeader;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java
index 484609c0c..4449770a5 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java
@@ -32,7 +32,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.api.dom.message.WSSecHeader;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.util.KeyUtils;
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 c622781bb..ffc272b73 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
@@ -30,7 +30,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.api.dom.message.WSSecHeader;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
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 db7b92b84..a3312c0c1 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
@@ -30,7 +30,7 @@ import javax.crypto.SecretKey;
import javax.security.auth.callback.CallbackHandler;
import org.apache.wss4j.api.dom.SOAPConstants;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.WSS4JConstants;
import org.apache.wss4j.common.bsp.BSPRule;
import org.apache.wss4j.common.crypto.Crypto;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java
index 2d0ef98b5..f36a940e0 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java
@@ -27,7 +27,7 @@ import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
index ef919286f..0de6e6fae 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
@@ -32,7 +32,7 @@ import org.apache.wss4j.common.crypto.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler;
import org.apache.wss4j.api.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.cache.MemoryReplayCache;
import org.apache.wss4j.common.cache.ReplayCache;
import org.apache.wss4j.common.crypto.Crypto;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java
index ccf4ecd19..bdd0f1764 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
import org.apache.wss4j.api.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.api.dom.message.WSSecHeader;
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 acf974152..7c914c990 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
@@ -36,7 +36,7 @@ import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.junit.jupiter.api.Test;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.util.KeyUtils;
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 0befb6e19..943509711 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
@@ -20,7 +20,7 @@
package org.apache.wss4j.dom.message;
import org.apache.wss4j.api.dom.SOAPConstants;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.api.dom.WSConstants;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java
index f0faedce6..82cb66ce5 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java
@@ -35,7 +35,7 @@ import javax.xml.crypto.dsig.keyinfo.X509Data;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.bsp.BSPRule;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java
index 99232992e..6131da8c2 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java
@@ -21,7 +21,7 @@ package org.apache.wss4j.dom.message;
import java.util.List;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.api.dom.message.WSSecHeader;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java
index 8e7267069..27a004e15 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java
@@ -23,7 +23,7 @@ import java.security.cert.X509Certificate;
import java.util.Collections;
import java.util.List;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.CryptoType;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java
index db0e75fae..7005af5f2 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java
@@ -34,7 +34,7 @@ import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.WSS4JConstants;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
index b93ad578a..5c8943d9e 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
@@ -26,7 +26,7 @@ import org.apache.wss4j.common.crypto.KeystoreCallbackHandler;
import org.apache.wss4j.api.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
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 8e2eed19a..30640a8f2 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
@@ -34,7 +34,7 @@ import org.apache.wss4j.api.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.util.KeyUtils;
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 46f0b33e3..63e5a0544 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
@@ -34,7 +34,7 @@ import org.apache.wss4j.api.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.util.KeyUtils;
diff --git
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java
b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java
index b4cf814e6..c4b0357e0 100644
---
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java
+++
b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java
@@ -31,7 +31,7 @@ import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
import javax.xml.crypto.dsig.spec.ExcC14NParameterSpec;
import org.apache.wss4j.api.dom.SignatureActionToken;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlReferenceTest.java
b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlReferenceTest.java
index 1ed90b77f..e0c47ece7 100644
---
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlReferenceTest.java
+++
b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlReferenceTest.java
@@ -19,7 +19,7 @@
package org.apache.wss4j.common.saml.dom;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.api.dom.WSConstants;
diff --git
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenCustomSignatureTest.java
b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenCustomSignatureTest.java
index 504ef5c39..d9f84c5bb 100644
---
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenCustomSignatureTest.java
+++
b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenCustomSignatureTest.java
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.saml.SAMLCallback;
diff --git
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenDerivedTest.java
b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenDerivedTest.java
index 3e606bb92..40968a250 100644
---
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenDerivedTest.java
+++
b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenDerivedTest.java
@@ -24,7 +24,7 @@ import java.util.List;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.CryptoType;
diff --git
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignaturePartsTest.java
b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignaturePartsTest.java
index c47768ec6..4c164c721 100644
---
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignaturePartsTest.java
+++
b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignaturePartsTest.java
@@ -19,7 +19,7 @@
package org.apache.wss4j.common.saml.dom;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.common.WSDataRef;
diff --git
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java
index 931c96a85..2638758a4 100644
---
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java
+++
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java
@@ -44,7 +44,7 @@ import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.Attachment;
import org.apache.wss4j.common.ext.AttachmentRequestCallback;
diff --git
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
index 82b9ce097..4a01ec4af 100644
---
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
+++
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
@@ -49,7 +49,7 @@ import javax.xml.xpath.XPathExpression;
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
import org.apache.wss4j.common.ConfigurationConstants;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.bsp.BSPRule;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
diff --git
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java
index 8437a22dc..b042b688e 100644
---
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java
+++
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java
@@ -35,7 +35,7 @@ import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java
index ad486843f..74624b943 100644
---
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java
+++
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java
@@ -35,7 +35,7 @@ import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.WSS4JConstants;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.Merlin;
diff --git
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java
index 1f064947b..a229cdf89 100644
---
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java
+++
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java
@@ -34,7 +34,7 @@ import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.CryptoType;
diff --git
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java
index c8c3e9f34..e67f660ea 100644
---
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java
+++
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java
@@ -26,7 +26,7 @@ import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.wss4j.common.WSEncryptionPart;
+import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.CryptoType;
