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
commit 63e1a7a13cfaa365e1c73d9e3e2bd8bd2bbf7a6e Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Wed Jul 2 13:47:12 2025 +0100 Getting the STS basic systests to compile --- .../org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java | 4 ++-- .../org/apache/cxf/systest/sts/claims/ClaimsValidator.java | 4 ++-- .../cxf/systest/sts/cross_domain/CrossDomainValidator.java | 4 ++-- .../org/apache/cxf/systest/sts/custom/CustomParameterTest.java | 4 ++-- .../org/apache/cxf/systest/sts/custom/CustomUTValidator.java | 4 ++-- .../systest/sts/custom_onbehalfof/CustomBSTTokenValidator.java | 4 ++-- .../systest/sts/custom_onbehalfof/LocalBSTTokenValidator.java | 4 ++-- .../cxf/systest/sts/deployment/CustomBSTTokenProvider.java | 2 +- .../cxf/systest/sts/distributed_caching/SCTTokenValidator.java | 4 ++-- .../apache/cxf/systest/sts/realms/DifferentRealmValidator.java | 4 ++-- .../apache/cxf/systest/sts/secure_conv/SCTTokenValidator.java | 4 ++-- .../cxf/systest/sts/transformation/DoubleItPortTypeImpl.java | 4 ++-- .../sts/intermediary_transformation/OnBehalfOfValidator.java | 8 ++++---- .../org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java | 10 +++++----- .../test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java | 8 ++++---- .../apache/cxf/systest/sts/username_actas/ActAsValidator.java | 8 ++++---- .../systest/sts/x509/CustomWSS4JSecurityContextCreator.java | 4 ++-- 17 files changed, 42 insertions(+), 42 deletions(-) diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java index e57299b023..2cccf76e2b 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java @@ -103,8 +103,8 @@ import org.apache.wss4j.common.util.DateUtil; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSDocInfo; import org.apache.wss4j.dom.engine.WSSConfig; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.processor.EncryptedKeyProcessor; import org.apache.wss4j.dom.util.X509Util; import org.apache.wss4j.policy.model.AbstractBinding; diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsValidator.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsValidator.java index d355e8a1c5..e85b85f655 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsValidator.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsValidator.java @@ -25,8 +25,8 @@ import org.w3c.dom.Element; import org.apache.cxf.sts.claims.ClaimTypes; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.validate.Credential; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.validate.Credential; import org.apache.wss4j.dom.validate.SamlAssertionValidator; import org.opensaml.core.xml.XMLObject; diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainValidator.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainValidator.java index dd5e1073f9..7a569ba61e 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainValidator.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainValidator.java @@ -20,8 +20,8 @@ package org.apache.cxf.systest.sts.cross_domain; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.validate.Credential; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.validate.Credential; import org.apache.wss4j.dom.validate.SamlAssertionValidator; /** diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java index e542a03eed..45458ac3bd 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java @@ -49,8 +49,8 @@ import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.util.DOM2Writer; import org.apache.wss4j.dom.WSDocInfo; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.processor.Processor; import org.apache.wss4j.dom.processor.SAMLTokenProcessor; import org.example.contract.doubleit.DoubleItPortType; diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomUTValidator.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomUTValidator.java index 208d1577ca..50f167f28b 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomUTValidator.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomUTValidator.java @@ -29,8 +29,8 @@ import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor; import org.apache.cxf.binding.soap.saaj.SAAJUtils; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.XMLUtils; -import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.validate.Credential; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.validate.Credential; import org.apache.wss4j.dom.validate.UsernameTokenValidator; import org.apache.wss4j.dom.validate.Validator; diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomBSTTokenValidator.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomBSTTokenValidator.java index ba79987573..9b998278ac 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomBSTTokenValidator.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomBSTTokenValidator.java @@ -21,8 +21,8 @@ package org.apache.cxf.systest.sts.custom_onbehalfof; import org.apache.cxf.ws.security.trust.STSTokenValidator; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.validate.Credential; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.validate.Credential; /** * This class validates a custom BinarySecurityToken by dispatching it to an STS. It then diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/LocalBSTTokenValidator.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/LocalBSTTokenValidator.java index b673ffa5b5..324fe5a6ad 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/LocalBSTTokenValidator.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/LocalBSTTokenValidator.java @@ -20,8 +20,8 @@ package org.apache.cxf.systest.sts.custom_onbehalfof; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.CustomTokenPrincipal; -import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.validate.Credential; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.validate.Credential; import org.apache.wss4j.dom.validate.Validator; /** diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomBSTTokenProvider.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomBSTTokenProvider.java index 97583a5f88..559b5a9422 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomBSTTokenProvider.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomBSTTokenProvider.java @@ -27,7 +27,7 @@ import org.apache.cxf.sts.token.provider.TokenProviderParameters; import org.apache.cxf.sts.token.provider.TokenProviderResponse; import org.apache.cxf.ws.security.sts.provider.STSException; import org.apache.wss4j.common.token.BinarySecurity; -import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.common.dom.WSConstants; /** * A TokenProvider implementation that creates a (custom) BinarySecurityToken. diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/SCTTokenValidator.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/SCTTokenValidator.java index e36bb62ab5..1c9846a432 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/SCTTokenValidator.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/SCTTokenValidator.java @@ -25,8 +25,8 @@ import org.apache.cxf.ws.policy.AssertionInfo; import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.cxf.ws.security.trust.STSTokenValidator; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.validate.Credential; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.validate.Credential; import org.apache.wss4j.policy.SP12Constants; /** diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmValidator.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmValidator.java index d1f4f7f5db..2d7b82774f 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmValidator.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmValidator.java @@ -21,8 +21,8 @@ package org.apache.cxf.systest.sts.realms; import org.apache.cxf.ws.security.trust.STSTokenValidator; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.validate.Credential; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.validate.Credential; import org.opensaml.saml.saml2.core.Assertion; /** diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTTokenValidator.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTTokenValidator.java index 7479ac154f..2f4e0dff37 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTTokenValidator.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTTokenValidator.java @@ -22,9 +22,9 @@ import org.apache.cxf.ws.security.trust.STSTokenValidator; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor; -import org.apache.wss4j.dom.validate.Credential; +import org.apache.wss4j.common.dom.validate.Credential; /** * This class validates a SecurityContextToken by dispatching it to an STS. It then diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java index beb74d286f..ab07c4a62f 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java @@ -27,8 +27,8 @@ import jakarta.xml.ws.handler.MessageContext; import org.apache.cxf.feature.Features; import org.apache.cxf.helpers.CastUtils; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.example.contract.doubleit.DoubleItPortType; diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/OnBehalfOfValidator.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/OnBehalfOfValidator.java index 49fb3bb003..9e76efbd29 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/OnBehalfOfValidator.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/OnBehalfOfValidator.java @@ -22,9 +22,9 @@ import java.util.List; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.validate.Credential; -import org.apache.wss4j.dom.validate.SamlAssertionValidator; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.validate.Credential; +import org.apache.wss4j.common.saml.validate.SamlAssertionValidator; import org.opensaml.saml.saml2.core.Assertion; import org.opensaml.saml.saml2.core.AttributeStatement; import org.opensaml.saml.saml2.core.NameID; @@ -39,7 +39,7 @@ public class OnBehalfOfValidator extends SamlAssertionValidator { @Override public Credential validate(Credential credential, RequestData data) throws WSSecurityException { Credential validatedCredential = super.validate(credential, data); - SamlAssertionWrapper assertion = validatedCredential.getSamlAssertion(); + SamlAssertionWrapper assertion = (SamlAssertionWrapper)validatedCredential.getSamlAssertion(); Assertion saml2Assertion = assertion.getSaml2(); if (saml2Assertion == null) { diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java index 0540a109f5..24b94c298a 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java @@ -62,11 +62,11 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal; import org.apache.wss4j.common.saml.OpenSAMLUtil; import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.WSDocInfo; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.processor.Processor; -import org.apache.wss4j.dom.processor.SAMLTokenProcessor; +import org.apache.wss4j.common.dom.WSDocInfo; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.processor.Processor; +import org.apache.wss4j.common.saml.processor.SAMLTokenProcessor; import org.junit.BeforeClass; diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java index 0f19784f64..18c8883d7a 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java @@ -57,10 +57,10 @@ import org.apache.wss4j.common.crypto.CryptoType; import org.apache.wss4j.common.saml.OpenSAMLUtil; import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.WSDocInfo; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.processor.SAMLTokenProcessor; +import org.apache.wss4j.common.dom.WSDocInfo; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.saml.processor.SAMLTokenProcessor; import static org.apache.cxf.ws.security.trust.STSUtils.WST_NS_05_12; import static org.junit.Assert.assertEquals; diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/ActAsValidator.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/ActAsValidator.java index a904ac8bd2..fea8955fb7 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/ActAsValidator.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/ActAsValidator.java @@ -24,9 +24,9 @@ import org.w3c.dom.Element; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.validate.Credential; -import org.apache.wss4j.dom.validate.SamlAssertionValidator; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.validate.Credential; +import org.apache.wss4j.common.saml.validate.SamlAssertionValidator; import org.opensaml.core.xml.XMLObject; import org.opensaml.saml.saml2.core.Assertion; import org.opensaml.saml.saml2.core.Attribute; @@ -42,7 +42,7 @@ public class ActAsValidator extends SamlAssertionValidator { @Override public Credential validate(Credential credential, RequestData data) throws WSSecurityException { Credential validatedCredential = super.validate(credential, data); - SamlAssertionWrapper assertion = validatedCredential.getSamlAssertion(); + SamlAssertionWrapper assertion = (SamlAssertionWrapper)validatedCredential.getSamlAssertion(); Assertion saml2Assertion = assertion.getSaml2(); if (saml2Assertion == null) { diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/CustomWSS4JSecurityContextCreator.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/CustomWSS4JSecurityContextCreator.java index 64071cb859..953f05efb8 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/CustomWSS4JSecurityContextCreator.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/CustomWSS4JSecurityContextCreator.java @@ -35,8 +35,8 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.wss4j.DefaultWSS4JSecurityContextCreator; import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerResult; /**
