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 f3a6e0f79 Moving actions into separate action folder
f3a6e0f79 is described below
commit f3a6e0f79781394337e3454b5de48ea22b11d4e3
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Wed Jul 9 08:15:58 2025 +0100
Moving actions into separate action folder
---
.../src/main/java/org/apache/wss4j/api/dom/RequestData.java | 2 ++
.../src/main/java/org/apache/wss4j/api/dom/action/Action.java | 1 -
.../apache/wss4j/api/dom/{ => action}/EncryptionActionToken.java | 2 +-
.../org/apache/wss4j/api/dom/{ => action}/SecurityActionToken.java | 2 +-
.../org/apache/wss4j/api/dom/{ => action}/SignatureActionToken.java | 2 +-
.../wss4j/api/dom/{ => action}/SignatureEncryptionActionToken.java | 3 ++-
.../java/org/apache/wss4j/dom/action/AbstractDerivedAction.java | 2 +-
.../main/java/org/apache/wss4j/dom/action/CustomTokenAction.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/action/EncryptionAction.java | 4 ++--
.../java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java | 6 +++---
.../src/main/java/org/apache/wss4j/dom/action/SignatureAction.java | 4 ++--
.../org/apache/wss4j/dom/action/SignatureConfirmationAction.java | 4 ++--
.../java/org/apache/wss4j/dom/action/SignatureDerivedAction.java | 6 +++---
.../src/main/java/org/apache/wss4j/dom/action/TimestampAction.java | 2 +-
.../main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java | 2 +-
.../java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java | 4 ++--
.../src/main/java/org/apache/wss4j/dom/handler/HandlerAction.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/handler/WSHandler.java | 6 +++---
.../src/test/java/org/apache/wss4j/dom/common/CustomAction.java | 2 +-
.../java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java | 4 ++--
.../test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java | 2 +-
.../org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java | 3 +--
.../org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java | 4 ++--
.../apache/wss4j/common/saml/action/SAMLTokenUnsignedAction.java | 2 +-
.../org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java | 2 +-
25 files changed, 38 insertions(+), 37 deletions(-)
diff --git
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/RequestData.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/RequestData.java
index 15c77015a..8d5e8752b 100644
---
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/RequestData.java
+++
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/RequestData.java
@@ -42,6 +42,8 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.PasswordEncryptor;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.dom.message.WSSecHeader;
+import org.apache.wss4j.api.dom.action.EncryptionActionToken;
+import org.apache.wss4j.api.dom.action.SignatureActionToken;
import org.apache.wss4j.api.dom.engine.WSSConfig;
import org.apache.wss4j.api.dom.validate.Validator;
import org.apache.xml.security.encryption.Serializer;
diff --git
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/Action.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/Action.java
index 51caeb067..78f1a999b 100644
---
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/Action.java
+++
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/Action.java
@@ -19,7 +19,6 @@
package org.apache.wss4j.api.dom.action;
-import org.apache.wss4j.api.dom.SecurityActionToken;
import org.apache.wss4j.api.dom.RequestData;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/EncryptionActionToken.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/EncryptionActionToken.java
similarity index 98%
rename from
ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/EncryptionActionToken.java
rename to
ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/EncryptionActionToken.java
index 65a639893..849775c71 100644
---
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/EncryptionActionToken.java
+++
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/EncryptionActionToken.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.wss4j.api.dom;
+package org.apache.wss4j.api.dom.action;
import org.apache.xml.security.encryption.params.KeyDerivationParameters;
diff --git
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SecurityActionToken.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/SecurityActionToken.java
similarity index 97%
rename from
ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SecurityActionToken.java
rename to
ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/SecurityActionToken.java
index 54888a327..9a26b2c39 100644
---
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SecurityActionToken.java
+++
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/SecurityActionToken.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.wss4j.api.dom;
+package org.apache.wss4j.api.dom.action;
import java.security.cert.X509Certificate;
diff --git
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SignatureActionToken.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/SignatureActionToken.java
similarity index 97%
rename from
ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SignatureActionToken.java
rename to
ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/SignatureActionToken.java
index d7d1afbea..609597452 100644
---
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SignatureActionToken.java
+++
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/SignatureActionToken.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.wss4j.api.dom;
+package org.apache.wss4j.api.dom.action;
/**
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/action/SignatureEncryptionActionToken.java
similarity index 98%
rename from
ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SignatureEncryptionActionToken.java
rename to
ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/SignatureEncryptionActionToken.java
index 228199efd..b75777747 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/action/SignatureEncryptionActionToken.java
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.wss4j.api.dom;
+package org.apache.wss4j.api.dom.action;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+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/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java
index 24747dfff..456f7a002 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Node;
import javax.crypto.SecretKey;
-import org.apache.wss4j.api.dom.SignatureEncryptionActionToken;
+import org.apache.wss4j.api.dom.action.SignatureEncryptionActionToken;
import org.apache.wss4j.common.derivedKey.ConversationConstants;
import org.apache.wss4j.api.dom.message.WSSecHeader;
import org.apache.wss4j.common.ext.WSPasswordCallback;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/CustomTokenAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/CustomTokenAction.java
index a69312a7c..a6a27e89a 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/CustomTokenAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/CustomTokenAction.java
@@ -19,7 +19,7 @@
package org.apache.wss4j.dom.action;
-import org.apache.wss4j.api.dom.SecurityActionToken;
+import org.apache.wss4j.api.dom.action.SecurityActionToken;
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/EncryptionAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionAction.java
index 88ab5bdbd..dd7e5c36a 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionAction.java
@@ -26,8 +26,8 @@ import javax.crypto.SecretKey;
import javax.security.auth.callback.Callback;
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.action.EncryptionActionToken;
+import org.apache.wss4j.api.dom.action.SecurityActionToken;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.ext.WSPasswordCallback;
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 bdc8c7c58..1d16099ab 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
@@ -25,9 +25,9 @@ import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
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.api.dom.action.EncryptionActionToken;
+import org.apache.wss4j.api.dom.action.SecurityActionToken;
+import org.apache.wss4j.api.dom.action.SignatureActionToken;
import org.apache.wss4j.api.dom.WSEncryptionPart;
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/SignatureAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
index e23f83a3d..6e65fad4e 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
@@ -24,8 +24,8 @@ import java.util.List;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.wss4j.api.dom.SecurityActionToken;
-import org.apache.wss4j.api.dom.SignatureActionToken;
+import org.apache.wss4j.api.dom.action.SecurityActionToken;
+import org.apache.wss4j.api.dom.action.SignatureActionToken;
import org.apache.wss4j.api.dom.WSEncryptionPart;
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/SignatureConfirmationAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java
index 3b0843dae..49a02a59f 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
@@ -21,8 +21,8 @@ package org.apache.wss4j.dom.action;
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.api.dom.action.SecurityActionToken;
+import org.apache.wss4j.api.dom.action.SignatureActionToken;
import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.dom.RequestData;
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 4c7087028..c32e92f90 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
@@ -25,9 +25,9 @@ import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
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.api.dom.action.EncryptionActionToken;
+import org.apache.wss4j.api.dom.action.SecurityActionToken;
+import org.apache.wss4j.api.dom.action.SignatureActionToken;
import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.derivedKey.ConversationConstants;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/TimestampAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/TimestampAction.java
index fbb10df14..242609565 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/TimestampAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/TimestampAction.java
@@ -19,7 +19,7 @@
package org.apache.wss4j.dom.action;
-import org.apache.wss4j.api.dom.SecurityActionToken;
+import org.apache.wss4j.api.dom.action.SecurityActionToken;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.dom.WSConstants;
import org.apache.wss4j.api.dom.RequestData;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java
index 7a3c52311..15082e302 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java
@@ -21,7 +21,7 @@ package org.apache.wss4j.dom.action;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.wss4j.api.dom.SecurityActionToken;
+import org.apache.wss4j.api.dom.action.SecurityActionToken;
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/UsernameTokenSignedAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java
index 484ae421f..ff1a42e53 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
@@ -26,8 +26,8 @@ import java.util.List;
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.api.dom.action.SecurityActionToken;
+import org.apache.wss4j.api.dom.action.SignatureActionToken;
import org.apache.wss4j.api.dom.WSEncryptionPart;
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/handler/HandlerAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/HandlerAction.java
index bfb2c2ad6..c80090ec0 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/HandlerAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/HandlerAction.java
@@ -19,7 +19,7 @@
package org.apache.wss4j.dom.handler;
-import org.apache.wss4j.api.dom.SecurityActionToken;
+import org.apache.wss4j.api.dom.action.SecurityActionToken;
/**
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 06906124f..085b8da72 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
@@ -33,9 +33,9 @@ import org.apache.wss4j.api.dom.SOAPConstants;
import org.apache.wss4j.api.dom.WSDocInfo;
import org.apache.wss4j.api.dom.engine.WSSConfig;
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.api.dom.action.EncryptionActionToken;
+import org.apache.wss4j.api.dom.action.SignatureActionToken;
+import org.apache.wss4j.api.dom.action.SignatureEncryptionActionToken;
import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.AlgorithmSuite;
import org.apache.wss4j.common.crypto.Crypto;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomAction.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomAction.java
index b9674c204..f30e24221 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomAction.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomAction.java
@@ -23,7 +23,7 @@ import org.apache.wss4j.api.dom.action.Action;
import java.util.Map;
-import org.apache.wss4j.api.dom.SecurityActionToken;
+import org.apache.wss4j.api.dom.action.SecurityActionToken;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.dom.RequestData;
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 568e57603..291a5247f 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
@@ -28,8 +28,8 @@ import javax.crypto.SecretKey;
import javax.security.auth.callback.CallbackHandler;
import javax.xml.crypto.dsig.SignatureMethod;
-import org.apache.wss4j.api.dom.EncryptionActionToken;
-import org.apache.wss4j.api.dom.SignatureActionToken;
+import org.apache.wss4j.api.dom.action.EncryptionActionToken;
+import org.apache.wss4j.api.dom.action.SignatureActionToken;
import org.apache.wss4j.api.dom.WSEncryptionPart;
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/EncryptionCRLTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java
index eacf63f52..a8d5ac33f 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java
@@ -31,7 +31,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.EncryptionActionToken;
+import org.apache.wss4j.api.dom.action.EncryptionActionToken;
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/SignatureAlgorithmSuiteTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java
index 9bbe9d9f3..a5cb2910d 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java
@@ -26,13 +26,12 @@ import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
import javax.xml.crypto.dsig.SignatureMethod;
-import org.apache.wss4j.api.dom.SignatureActionToken;
+import org.apache.wss4j.api.dom.action.SignatureActionToken;
import org.apache.wss4j.common.bsp.BSPRule;
import org.apache.wss4j.common.crypto.AlgorithmSuite;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.api.dom.message.WSSecHeader;
-import org.apache.wss4j.dom.message.WSSecSignature;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.KeyUtils;
import org.apache.wss4j.common.util.SOAPUtil;
diff --git
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java
b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java
index 9d4ff3d6f..c54d6361c 100644
---
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java
+++
b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java
@@ -21,8 +21,8 @@ package org.apache.wss4j.common.saml.action;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.wss4j.api.dom.SecurityActionToken;
-import org.apache.wss4j.api.dom.SignatureActionToken;
+import org.apache.wss4j.api.dom.action.SecurityActionToken;
+import org.apache.wss4j.api.dom.action.SignatureActionToken;
import org.apache.wss4j.common.ext.WSPasswordCallback;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
diff --git
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenUnsignedAction.java
b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenUnsignedAction.java
index 4e820e6ed..c74faf8cf 100644
---
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenUnsignedAction.java
+++
b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenUnsignedAction.java
@@ -21,7 +21,7 @@ package org.apache.wss4j.common.saml.action;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.wss4j.api.dom.SecurityActionToken;
+import org.apache.wss4j.api.dom.action.SecurityActionToken;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.saml.SAMLCallback;
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 b49271066..f56cc2cb2 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
@@ -30,7 +30,7 @@ import javax.xml.crypto.dsig.dom.DOMSignContext;
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.api.dom.action.SignatureActionToken;
import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoType;
