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 b89fa036c08b2783f9b4d0e121de0a2ba7bc0f80 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Thu Jul 3 10:15:26 2025 +0100 Fixing various tests --- .../kerberos/common/KerberosClientPasswordCallback.java | 4 ++-- .../cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java | 2 +- .../cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java | 2 +- .../security/oauth2/grants/CallbackHandlerLoginHandler.java | 10 +++++----- .../systest/jaxrs/security/saml/SamlRetrievalInterceptor.java | 2 +- .../org/apache/cxf/systest/wssec/examples/saml/server.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KerberosClientPasswordCallback.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KerberosClientPasswordCallback.java index d3937432df..2fb69e2534 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KerberosClientPasswordCallback.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KerberosClientPasswordCallback.java @@ -30,8 +30,8 @@ import javax.security.auth.callback.UnsupportedCallbackException; import org.apache.cxf.helpers.DOMUtils; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.engine.WSSConfig; -import org.apache.wss4j.dom.message.token.KerberosSecurity; +import org.apache.wss4j.common.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.message.token.KerberosSecurity; /** * A CallbackHandler implementation for the kerberos client. diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java index 50878effd1..4486d5739d 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java @@ -36,7 +36,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.AbstractClientServerTestBase; import org.apache.cxf.testutil.common.TestUtil; import org.apache.kerby.kerberos.kerb.server.SimpleKdcServer; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.example.contract.doubleit.DoubleItPortType; import org.junit.Assert; diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java index 0b0522fbfb..4a2ed45c48 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java @@ -33,7 +33,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.AbstractClientServerTestBase; import org.apache.cxf.testutil.common.TestUtil; import org.apache.kerby.kerberos.kerb.server.SimpleKdcServer; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.example.contract.doubleit.DoubleItPortType; import org.junit.Assert; diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerLoginHandler.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerLoginHandler.java index a9ed02fe6d..0e0419cc02 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerLoginHandler.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerLoginHandler.java @@ -29,10 +29,10 @@ import org.apache.cxf.rs.security.oauth2.common.Client; import org.apache.cxf.rs.security.oauth2.common.UserSubject; import org.apache.cxf.rs.security.oauth2.grants.owner.ResourceOwnerLoginHandler; import org.apache.wss4j.common.WSS4JConstants; -import org.apache.wss4j.dom.engine.WSSConfig; -import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.message.token.UsernameToken; -import org.apache.wss4j.dom.validate.Credential; +import org.apache.wss4j.common.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.message.token.UsernameToken; +import org.apache.wss4j.common.dom.validate.Credential; import org.apache.wss4j.dom.validate.UsernameTokenValidator; /** @@ -81,4 +81,4 @@ public class CallbackHandlerLoginHandler implements ResourceOwnerLoginHandler { this.callbackHandler = callbackHandler; } -} \ No newline at end of file +} diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlRetrievalInterceptor.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlRetrievalInterceptor.java index 012d8f25ae..30a88f4884 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlRetrievalInterceptor.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlRetrievalInterceptor.java @@ -36,7 +36,7 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SAMLCallback; import org.apache.wss4j.common.saml.SAMLUtil; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; /** * An Interceptor to "retrieve" a SAML Token, i.e. create one and set it on the message diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml index b374360e2a..0fe92a5462 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml @@ -34,7 +34,7 @@ </cxf:features> </cxf:bus> - <bean id="allowUnsignedBearerAssertions" class="org.apache.wss4j.dom.validate.SamlAssertionValidator"> + <bean id="allowUnsignedBearerAssertions" class="org.apache.wss4j.common.saml.validate.SamlAssertionValidator"> <property name="requireBearerSignature" value="false" /> </bean> <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl"> @@ -127,4 +127,4 @@ </httpj:tlsServerParameters> </httpj:engine> </httpj:engine-factory> -</beans> \ No newline at end of file +</beans>
