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 fd649187e3a7e94429a56916a8f313e3aef6c17c
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Fri Jun 27 08:16:22 2025 +0100
Moving more SAML classes out of ws-security-dom
---
.../main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java | 2 +-
.../main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java | 2 +-
.../main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java | 1 +
.../src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java | 1 +
.../src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java | 1 +
.../org/apache/wss4j/common/saml/message}/WSSSAMLKeyInfoProcessor.java | 2 +-
.../java/org/apache/wss4j/common/saml/message}/WSSecSignatureSAML.java | 2 +-
.../java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java | 2 +-
14 files changed, 14 insertions(+), 11 deletions(-)
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
index 60c282f58..6206c719a 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
@@ -31,7 +31,7 @@ import org.apache.wss4j.common.saml.SAMLUtil;
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.dom.saml.WSSecSignatureSAML;
+import org.apache.wss4j.common.saml.message.WSSecSignatureSAML;
public class SAMLTokenSignedAction implements Action {
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 c12443e2c..54cfd34c5 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
@@ -49,7 +49,7 @@ import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.common.dom.processor.Processor;
import org.apache.wss4j.common.dom.RequestData;
-import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor;
+import org.apache.wss4j.common.saml.message.WSSSAMLKeyInfoProcessor;
import org.apache.wss4j.common.dom.validate.Credential;
import org.apache.wss4j.common.dom.validate.Validator;
import org.opensaml.xmlsec.signature.KeyInfo;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java
index aa26b775f..3fed798fe 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java
@@ -38,7 +38,7 @@ import org.apache.wss4j.common.dom.WSDocInfo;
import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.common.dom.processor.STRParserUtil;
import org.apache.wss4j.common.dom.RequestData;
-import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor;
+import org.apache.wss4j.common.saml.message.WSSSAMLKeyInfoProcessor;
import org.w3c.dom.Element;
/**
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java
index 17529c806..3644d0fcf 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java
@@ -42,7 +42,7 @@ import
org.apache.wss4j.common.dom.message.token.DerivedKeyToken;
import org.apache.wss4j.common.dom.message.token.UsernameToken;
import org.apache.wss4j.common.dom.processor.Processor;
import org.apache.wss4j.common.dom.processor.STRParserUtil;
-import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor;
+import org.apache.wss4j.common.saml.message.WSSSAMLKeyInfoProcessor;
import org.w3c.dom.Element;
/**
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java
index 176cf9689..0d585905e 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java
@@ -52,7 +52,7 @@ import
org.apache.wss4j.common.dom.message.token.SecurityContextToken;
import org.apache.wss4j.common.dom.message.token.UsernameToken;
import org.apache.wss4j.common.dom.processor.Processor;
import org.apache.wss4j.common.dom.processor.STRParserUtil;
-import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor;
+import org.apache.wss4j.common.saml.message.WSSSAMLKeyInfoProcessor;
import org.w3c.dom.Element;
/**
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 e11ecc56b..4e91640e6 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
@@ -49,7 +49,7 @@ import
org.apache.wss4j.common.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.common.dom.message.WSSecHeader;
import org.apache.wss4j.common.dom.message.WSSecSignature;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.apache.wss4j.dom.saml.WSSecSignatureSAML;
+import org.apache.wss4j.common.saml.message.WSSecSignatureSAML;
import org.apache.wss4j.common.dom.message.SignatureUtils;
import org.apache.wss4j.dom.util.WSSecurityUtil;
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 56159a137..941d0037b 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
@@ -48,7 +48,7 @@ import org.apache.wss4j.common.saml.builder.SAML1Constants;
import org.apache.wss4j.common.util.Loader;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.saml.SignedSamlTokenHOKTest;
-import org.apache.wss4j.dom.saml.WSSecSignatureSAML;
+import org.apache.wss4j.common.saml.message.WSSecSignatureSAML;
import org.apache.wss4j.dom.util.WSSecurityUtil;
import org.junit.jupiter.api.Test;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
index eacf203b2..511a74629 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
@@ -46,7 +46,7 @@ import org.apache.wss4j.common.util.Loader;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.common.dom.message.WSSecHeader;
import org.apache.wss4j.common.saml.message.WSSecSAMLToken;
-
+import org.apache.wss4j.common.saml.message.WSSecSignatureSAML;
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
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 983176f7f..17659550d 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
@@ -40,6 +40,7 @@ import org.apache.wss4j.common.saml.SAMLCallback;
import org.apache.wss4j.common.saml.SAMLUtil;
import org.apache.wss4j.common.saml.builder.SAML1Constants;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.common.saml.message.WSSecSignatureSAML;
import org.apache.wss4j.common.util.KeyUtils;
import org.apache.wss4j.common.util.Loader;
import org.apache.wss4j.common.util.XMLUtils;
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 5d5ac93f2..390088c5c 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
@@ -37,6 +37,7 @@ import org.apache.wss4j.common.saml.SAMLCallback;
import org.apache.wss4j.common.saml.SAMLUtil;
import org.apache.wss4j.common.saml.builder.SAML1Constants;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.common.saml.message.WSSecSignatureSAML;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.common.dom.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
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 2318e8274..7c6e0d71b 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
@@ -42,6 +42,7 @@ import org.apache.wss4j.common.saml.SAMLUtil;
import org.apache.wss4j.common.saml.bean.KeyInfoBean.CERT_IDENTIFIER;
import org.apache.wss4j.common.saml.builder.SAML1Constants;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.common.saml.message.WSSecSignatureSAML;
import org.apache.wss4j.common.util.Loader;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.common.dom.message.WSSecHeader;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java
b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSSAMLKeyInfoProcessor.java
similarity index 99%
rename from
ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java
rename to
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSSAMLKeyInfoProcessor.java
index c91ac7e6a..2fe3cb403 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java
+++
b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSSAMLKeyInfoProcessor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml;
+package org.apache.wss4j.common.saml.message;
import java.util.List;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java
similarity index 99%
rename from
ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
rename to
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java
index a7cf3051a..279c366d5 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
+++
b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml;
+package org.apache.wss4j.common.saml.message;
import java.security.PublicKey;
import java.security.cert.X509Certificate;
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 e84652a9e..424a4278e 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
@@ -51,7 +51,7 @@ import org.apache.wss4j.common.dom.WSConstants;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.message.WSSecEncrypt;
import org.apache.wss4j.common.dom.message.WSSecHeader;
-import org.apache.wss4j.dom.saml.WSSecSignatureSAML;
+import org.apache.wss4j.common.saml.message.WSSecSignatureSAML;
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants;
