This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch coheigea/wss4j-saml-refactor
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/coheigea/wss4j-saml-refactor
by this push:
new bc4edec550 Updating with TokenContext changes
bc4edec550 is described below
commit bc4edec55032bce8b284bd1b78da5aaefc87ec1a
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Mon Aug 11 12:26:26 2025 +0100
Updating with TokenContext changes
---
.../java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java | 2 +-
.../apache/cxf/ws/security/wss4j/saml/CustomStaxSamlValidator.java | 4 ++--
.../java/org/apache/cxf/systest/sts/claims/StaxClaimsValidator.java | 2 +-
.../test/java/org/apache/cxf/systest/ws/ut/CustomStaxUTValidator.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
index 5d786b7703..c0a4361a72 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
@@ -55,11 +55,11 @@ import
org.apache.wss4j.stax.impl.securityToken.X509V3SecurityTokenImpl;
import org.apache.wss4j.api.stax.securityToken.SamlSecurityToken;
import org.apache.wss4j.api.stax.securityToken.UsernameSecurityToken;
import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.api.stax.utils.WSSUtils;
import org.apache.wss4j.stax.validate.BinarySecurityTokenValidator;
import org.apache.wss4j.stax.validate.BinarySecurityTokenValidatorImpl;
import org.apache.wss4j.stax.validate.SamlTokenValidatorImpl;
-import org.apache.wss4j.stax.validate.TokenContext;
import org.apache.wss4j.stax.validate.UsernameTokenValidator;
import org.apache.xml.security.binding.xop.Include;
import org.apache.xml.security.exceptions.XMLSecurityException;
diff --git
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/CustomStaxSamlValidator.java
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/CustomStaxSamlValidator.java
index 41b2b1672a..9c653f44ed 100644
---
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/CustomStaxSamlValidator.java
+++
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/CustomStaxSamlValidator.java
@@ -24,8 +24,8 @@ import org.apache.wss4j.dom.saml.OpenSAMLUtil;
import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.stax.impl.securityToken.SamlSecurityTokenImpl;
import org.apache.wss4j.api.stax.securityToken.SamlSecurityToken;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.stax.validate.SamlTokenValidatorImpl;
-import org.apache.wss4j.stax.validate.TokenContext;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
/**
@@ -90,4 +90,4 @@ public class CustomStaxSamlValidator extends
SamlTokenValidatorImpl {
return (T)token;
}
-}
\ No newline at end of file
+}
diff --git
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/StaxClaimsValidator.java
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/StaxClaimsValidator.java
index 3630fd1b05..bcd6fe3ca4 100644
---
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/StaxClaimsValidator.java
+++
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/StaxClaimsValidator.java
@@ -29,8 +29,8 @@ import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.stax.impl.securityToken.SamlSecurityTokenImpl;
import org.apache.wss4j.api.stax.securityToken.SamlSecurityToken;
import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.stax.validate.SamlTokenValidatorImpl;
-import org.apache.wss4j.stax.validate.TokenContext;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
import org.opensaml.core.xml.XMLObject;
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/CustomStaxUTValidator.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/CustomStaxUTValidator.java
index 1321981cf5..0a4a395894 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/CustomStaxUTValidator.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/CustomStaxUTValidator.java
@@ -26,7 +26,7 @@ import org.apache.wss4j.binding.wss10.UsernameTokenType;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.stax.impl.securityToken.UsernameSecurityTokenImpl;
import org.apache.wss4j.api.stax.securityToken.UsernameSecurityToken;
-import org.apache.wss4j.stax.validate.TokenContext;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.stax.validate.UsernameTokenValidatorImpl;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
