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 c5f46698b Moving SAMLTokenSignedAction to saml module
c5f46698b is described below
commit c5f46698bd012f758b20c4b4950923baaaf087a6
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Fri Jun 27 08:23:18 2025 +0100
Moving SAMLTokenSignedAction to saml module
---
.../src/main/java/org/apache/wss4j/common}/dom/action/ActionUtils.java | 2 +-
.../main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java | 1 +
.../src/main/java/org/apache/wss4j/dom/action/SignatureAction.java | 1 +
.../main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java | 1 +
.../src/main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java | 1 +
.../java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java | 1 +
.../META-INF/services/org.apache.wss4j.common.dom.action.Action | 1 -
.../org/apache/wss4j/common/saml}/action/SAMLTokenSignedAction.java | 3 ++-
.../META-INF/services/org.apache.wss4j.common.dom.action.Action | 1 +
9 files changed, 9 insertions(+), 3 deletions(-)
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/ActionUtils.java
b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/action/ActionUtils.java
similarity index 98%
rename from
ws-security-dom/src/main/java/org/apache/wss4j/dom/action/ActionUtils.java
rename to
ws-security-common/src/main/java/org/apache/wss4j/common/dom/action/ActionUtils.java
index 47d4b3faf..81ade8fb7 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/ActionUtils.java
+++
b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/action/ActionUtils.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.action;
+package org.apache.wss4j.common.dom.action;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
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 c02b817fe..6ff4371b7 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
@@ -37,6 +37,7 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.common.dom.WSConstants;
import org.apache.wss4j.common.dom.RequestData;
import org.apache.wss4j.common.dom.action.Action;
+import org.apache.wss4j.common.dom.action.ActionUtils;
import org.apache.wss4j.dom.message.WSSecDKEncrypt;
import org.apache.wss4j.dom.util.WSSecurityUtil;
import org.w3c.dom.Document;
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 1686fb8e7..28020a5df 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
@@ -32,6 +32,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.dom.WSConstants;
import org.apache.wss4j.common.dom.RequestData;
import org.apache.wss4j.common.dom.action.Action;
+import org.apache.wss4j.common.dom.action.ActionUtils;
import org.apache.wss4j.common.dom.message.WSSecSignature;
import org.apache.wss4j.dom.util.WSSecurityUtil;
import org.w3c.dom.Document;
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 38b3853ea..00fef6cc3 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
@@ -38,6 +38,7 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.common.dom.WSConstants;
import org.apache.wss4j.common.dom.RequestData;
import org.apache.wss4j.common.dom.action.Action;
+import org.apache.wss4j.common.dom.action.ActionUtils;
import org.apache.wss4j.dom.message.WSSecDKSign;
import org.apache.wss4j.dom.util.WSSecurityUtil;
import org.w3c.dom.Document;
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 c8daa4ac7..39c3bbf23 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
@@ -27,6 +27,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.dom.WSConstants;
import org.apache.wss4j.common.dom.RequestData;
import org.apache.wss4j.common.dom.action.Action;
+import org.apache.wss4j.common.dom.action.ActionUtils;
import org.apache.wss4j.dom.message.WSSecUsernameToken;
public class UsernameTokenAction implements Action {
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 b181b0bf0..22514c76d 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
@@ -34,6 +34,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.UsernameTokenUtil;
import org.apache.wss4j.common.dom.RequestData;
import org.apache.wss4j.common.dom.action.Action;
+import org.apache.wss4j.common.dom.action.ActionUtils;
import org.apache.wss4j.dom.message.WSSecUsernameToken;
import org.apache.wss4j.common.dom.message.WSSecSignature;
import org.apache.wss4j.dom.util.WSSecurityUtil;
diff --git
a/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.action.Action
b/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.action.Action
index 9c6730cd9..2a8a9773f 100644
---
a/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.action.Action
+++
b/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.action.Action
@@ -1,7 +1,6 @@
org.apache.wss4j.dom.action.CustomTokenAction
org.apache.wss4j.dom.action.EncryptionAction
org.apache.wss4j.dom.action.EncryptionDerivedAction
-org.apache.wss4j.dom.action.SAMLTokenSignedAction
org.apache.wss4j.dom.action.SignatureAction
org.apache.wss4j.dom.action.SignatureConfirmationAction
org.apache.wss4j.dom.action.SignatureDerivedAction
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java
similarity index 98%
rename from
ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
rename to
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java
index 6206c719a..8ce13a9c7 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
+++
b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.action;
+package org.apache.wss4j.common.saml.action;
import javax.security.auth.callback.CallbackHandler;
@@ -32,6 +32,7 @@ import org.apache.wss4j.common.dom.WSConstants;
import org.apache.wss4j.common.dom.RequestData;
import org.apache.wss4j.common.dom.action.Action;
import org.apache.wss4j.common.saml.message.WSSecSignatureSAML;
+import org.apache.wss4j.common.dom.action.ActionUtils;
public class SAMLTokenSignedAction implements Action {
diff --git
a/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.action.Action
b/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.action.Action
index e29cddaca..4ac0995eb 100644
---
a/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.action.Action
+++
b/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.action.Action
@@ -1 +1,2 @@
org.apache.wss4j.common.saml.action.SAMLTokenUnsignedAction
+org.apache.wss4j.common.saml.action.SAMLTokenSignedAction
