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 4019013080e993f005ae4bac353834d442da8fb2 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Fri Jun 20 12:36:04 2025 +0100 Moving SamlAssertionValidator into SAML module --- .../META-INF/services/org.apache.wss4j.common.dom.validate.Validator | 1 - .../java/org/apache/wss4j/dom/common/CustomSamlAssertionValidator.java | 2 +- .../src/test/java/org/apache/wss4j/dom/message/ReplayTest.java | 2 +- .../src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java | 2 +- .../org/apache/wss4j/common/saml}/validate/SamlAssertionValidator.java | 2 +- .../META-INF/services/org.apache.wss4j.common.dom.validate.Validator | 1 + 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.validate.Validator b/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.validate.Validator index c0d49d350..634f2707f 100644 --- a/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.validate.Validator +++ b/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.validate.Validator @@ -1,4 +1,3 @@ org.apache.wss4j.common.dom.validate.SignatureTrustValidator -org.apache.wss4j.dom.validate.SamlAssertionValidator org.apache.wss4j.dom.validate.TimestampValidator org.apache.wss4j.dom.validate.UsernameTokenValidator diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomSamlAssertionValidator.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomSamlAssertionValidator.java index 9f3669896..15575c878 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomSamlAssertionValidator.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomSamlAssertionValidator.java @@ -23,7 +23,7 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.dom.validate.Credential; -import org.apache.wss4j.dom.validate.SamlAssertionValidator; +import org.apache.wss4j.common.saml.validate.SamlAssertionValidator; public class CustomSamlAssertionValidator extends SamlAssertionValidator { 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 91cdb5e7f..a5af2b959 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 @@ -51,7 +51,7 @@ import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.util.WSSecurityUtil; -import org.apache.wss4j.dom.validate.SamlAssertionValidator; +import org.apache.wss4j.common.saml.validate.SamlAssertionValidator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java index bb88c7035..057bd650d 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java @@ -68,7 +68,7 @@ import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.common.dom.message.WSSecHeader; import org.apache.wss4j.common.saml.message.WSSecSAMLToken; -import org.apache.wss4j.dom.validate.SamlAssertionValidator; +import org.apache.wss4j.common.saml.validate.SamlAssertionValidator; import org.apache.xml.security.encryption.EncryptedData; import org.apache.xml.security.encryption.EncryptedKey; import org.apache.xml.security.encryption.Reference; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SamlAssertionValidator.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/validate/SamlAssertionValidator.java similarity index 99% rename from ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SamlAssertionValidator.java rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/validate/SamlAssertionValidator.java index bfd8fe97a..b2c738687 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SamlAssertionValidator.java +++ b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/validate/SamlAssertionValidator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.wss4j.dom.validate; +package org.apache.wss4j.common.saml.validate; import java.time.Instant; import java.util.List; diff --git a/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.validate.Validator b/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.validate.Validator new file mode 100644 index 000000000..450021932 --- /dev/null +++ b/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.validate.Validator @@ -0,0 +1 @@ +org.apache.wss4j.common.saml.validate.SamlAssertionValidator
