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 6a5d6bf73732264ed8c510c2f821ecff2fb6583c Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Tue Jul 15 09:51:48 2025 +0100 WSS4J StAX API changes --- .../src/main/java/demo/wssec/client/StaxClient.java | 6 +++--- .../src/main/java/demo/wssec/server/StaxServer.java | 6 +++--- .../ut/src/main/java/demo/wssec/client/StaxClient.java | 4 ++-- .../ut/src/main/java/demo/wssec/server/StaxServer.java | 4 ++-- .../policy/interceptors/HttpsTokenInterceptorProvider.java | 4 ++-- .../interceptors/KerberosTokenInterceptorProvider.java | 6 +++--- .../ws/security/policy/interceptors/NegotiationUtils.java | 2 +- .../cxf/ws/security/trust/STSStaxTokenValidator.java | 12 ++++++------ .../ws/security/wss4j/AbstractWSS4JStaxInterceptor.java | 4 ++-- .../security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java | 8 ++++---- .../security/wss4j/PolicyBasedWSS4JStaxOutInterceptor.java | 2 +- .../cxf/ws/security/wss4j/StaxActionInInterceptor.java | 6 +++--- .../cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java | 2 +- .../security/wss4j/StaxSecurityContextInInterceptor.java | 14 +++++++------- .../cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java | 8 ++++---- .../cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java | 4 ++-- .../java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java | 4 ++-- .../wss4j/policyhandlers/AbstractStaxBindingHandler.java | 8 ++++---- .../wss4j/policyhandlers/StaxAsymmetricBindingHandler.java | 6 +++--- .../wss4j/policyhandlers/StaxSymmetricBindingHandler.java | 8 ++++---- .../wss4j/policyhandlers/StaxTransportBindingHandler.java | 4 ++-- .../security/wss4j/DOMToStaxEncryptionIdentifierTest.java | 2 +- .../cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java | 4 ++-- .../security/wss4j/DOMToStaxSignatureIdentifierTest.java | 2 +- .../ws/security/wss4j/StaxCryptoCoverageCheckerTest.java | 4 ++-- .../cxf/ws/security/wss4j/StaxRoundTripActionTest.java | 4 ++-- .../apache/cxf/ws/security/wss4j/StaxRoundTripTest.java | 6 +++--- .../security/wss4j/StaxToDOMEncryptionIdentifierTest.java | 6 +++--- .../cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java | 6 +++--- .../security/wss4j/StaxToDOMSignatureIdentifierTest.java | 6 +++--- .../ws/security/wss4j/WSS4JInOutWithAttachmentsTest.java | 2 +- .../ws/security/wss4j/saml/CustomStaxSamlValidator.java | 6 +++--- .../cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java | 2 +- .../cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java | 6 +++--- .../org/apache/cxf/sts/operation/TokenIssueOperation.java | 4 ++-- .../org/apache/cxf/sts/token/canceller/SCTCanceller.java | 2 +- .../apache/cxf/sts/token/provider/TokenProviderUtils.java | 2 +- .../apache/cxf/systest/sts/claims/StaxClaimsValidator.java | 4 ++-- .../java/org/apache/cxf/systest/ws/action/ActionTest.java | 6 +++--- .../apache/cxf/systest/ws/ut/CustomStaxUTValidator.java | 2 +- 40 files changed, 99 insertions(+), 99 deletions(-) diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java index 3e9b006084..6e3c0c2a24 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java +++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java @@ -35,9 +35,9 @@ import org.apache.cxf.ws.security.wss4j.StaxCryptoCoverageChecker; import org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor; import org.apache.cxf.ws.security.wss4j.WSS4JStaxOutInterceptor; import org.apache.wss4j.common.crypto.CryptoFactory; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.stax.ext.SecurePart; import demo.wssec.client.UTPasswordCallback; diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java index 2f9990ffc1..fb699415c8 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java +++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java @@ -32,9 +32,9 @@ import org.apache.cxf.ws.security.wss4j.StaxCryptoCoverageChecker; import org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor; import org.apache.cxf.ws.security.wss4j.WSS4JStaxOutInterceptor; import org.apache.wss4j.common.crypto.CryptoFactory; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.stax.ext.SecurePart; /** diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java index f20a3187a5..95ed10ff34 100644 --- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java +++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java @@ -31,8 +31,8 @@ import org.apache.cxf.hello_world_soap_http.Greeter; import org.apache.cxf.hello_world_soap_http.GreeterService; import org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor; import org.apache.cxf.ws.security.wss4j.WSS4JStaxOutInterceptor; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; import demo.wssec.server.UTPasswordCallback; diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java index 745804a8fa..9bf7e9ee09 100644 --- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java +++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java @@ -29,8 +29,8 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.jaxws.EndpointImpl; import org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor; import org.apache.cxf.ws.security.wss4j.WSS4JStaxOutInterceptor; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; /** * A StAX-based server diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java index 9bc4d77cf0..c1e939c53f 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java @@ -57,8 +57,8 @@ import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.model.HttpsToken; import org.apache.wss4j.stax.impl.securityToken.HttpsSecurityTokenImpl; -import org.apache.wss4j.stax.securityEvent.HttpsTokenSecurityEvent; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.api.stax.securityEvent.HttpsTokenSecurityEvent; +import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.securityEvent.SecurityEvent; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java index a1c546c010..1852437146 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java @@ -62,9 +62,9 @@ import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.SPConstants; -import org.apache.wss4j.stax.securityEvent.KerberosTokenSecurityEvent; -import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; -import org.apache.wss4j.stax.securityToken.KerberosServiceSecurityToken; +import org.apache.wss4j.api.stax.securityEvent.KerberosTokenSecurityEvent; +import org.apache.wss4j.api.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.api.stax.securityToken.KerberosServiceSecurityToken; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.apache.xml.security.utils.XMLUtils; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java index 069fda65a2..6c3f4e0e01 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java @@ -63,7 +63,7 @@ import org.apache.wss4j.policy.model.AbstractBinding; import org.apache.wss4j.policy.model.AlgorithmSuite; import org.apache.wss4j.policy.model.Trust10; import org.apache.wss4j.policy.model.Trust13; -import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.api.stax.securityEvent.WSSecurityEventConstants; import org.apache.xml.security.stax.securityEvent.SecurityEvent; /** 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 e3d4440cda..458bbec254 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 @@ -45,17 +45,17 @@ import org.apache.wss4j.common.util.AttachmentUtils; import org.apache.wss4j.common.util.UsernameTokenUtil; import org.apache.wss4j.api.dom.message.token.KerberosSecurity; import org.apache.wss4j.api.dom.message.token.UsernameToken; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.impl.securityToken.KerberosServiceSecurityTokenImpl; import org.apache.wss4j.stax.impl.securityToken.SamlSecurityTokenImpl; import org.apache.wss4j.stax.impl.securityToken.UsernameSecurityTokenImpl; import org.apache.wss4j.stax.impl.securityToken.X509PKIPathv1SecurityTokenImpl; import org.apache.wss4j.stax.impl.securityToken.X509V3SecurityTokenImpl; -import org.apache.wss4j.stax.securityToken.SamlSecurityToken; -import org.apache.wss4j.stax.securityToken.UsernameSecurityToken; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; -import org.apache.wss4j.stax.utils.WSSUtils; +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.utils.WSSUtils; import org.apache.wss4j.stax.validate.BinarySecurityTokenValidator; import org.apache.wss4j.stax.validate.BinarySecurityTokenValidatorImpl; import org.apache.wss4j.stax.validate.SamlTokenValidatorImpl; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java index 092ee7f876..9667846ca1 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java @@ -57,8 +57,8 @@ import org.apache.wss4j.common.crypto.PasswordEncryptor; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.Loader; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.setup.ConfigurationConverter; import org.apache.xml.security.stax.ext.XMLSecurityConstants; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java index a004df38c7..0010d1b5b9 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java @@ -57,11 +57,11 @@ import org.apache.wss4j.policy.model.AlgorithmSuite; import org.apache.wss4j.policy.stax.OperationPolicy; import org.apache.wss4j.policy.stax.enforcer.PolicyEnforcer; import org.apache.wss4j.policy.stax.enforcer.PolicyInputProcessor; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.impl.securityToken.HttpsSecurityTokenImpl; -import org.apache.wss4j.stax.securityEvent.HttpsTokenSecurityEvent; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.api.stax.securityEvent.HttpsTokenSecurityEvent; +import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.apache.xml.security.stax.securityEvent.SecurityEventListener; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxOutInterceptor.java index af39f040ea..f307bfa890 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxOutInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxOutInterceptor.java @@ -36,7 +36,7 @@ import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.model.AsymmetricBinding; import org.apache.wss4j.policy.model.SymmetricBinding; import org.apache.wss4j.policy.model.TransportBinding; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; import org.apache.xml.security.stax.ext.OutboundSecurityContext; /** diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxActionInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxActionInInterceptor.java index f9ef5b0d90..349af08c05 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxActionInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxActionInInterceptor.java @@ -28,9 +28,9 @@ import org.apache.cxf.message.MessageUtils; import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; -import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.securityEvent.OperationSecurityEvent; +import org.apache.wss4j.api.stax.securityEvent.WSSecurityEventConstants; import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.apache.xml.security.stax.securityEvent.SecurityEventConstants.Event; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java index 94c45ee347..6cbfdc4902 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java @@ -33,7 +33,7 @@ import org.apache.cxf.ws.addressing.AddressingProperties; import org.apache.cxf.ws.addressing.Names; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.api.dom.WSConstants; -import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.api.stax.securityEvent.WSSecurityEventConstants; import org.apache.xml.security.stax.securityEvent.AbstractSecuredElementSecurityEvent; import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.apache.xml.security.stax.securityEvent.SecurityEventConstants.Event; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java index ab09a2136c..9a61158456 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java @@ -43,13 +43,13 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.SAMLTokenPrincipal; import org.apache.wss4j.dom.saml.SamlAssertionWrapper; -import org.apache.wss4j.stax.securityEvent.KerberosTokenSecurityEvent; -import org.apache.wss4j.stax.securityEvent.KeyValueTokenSecurityEvent; -import org.apache.wss4j.stax.securityEvent.SamlTokenSecurityEvent; -import org.apache.wss4j.stax.securityEvent.UsernameTokenSecurityEvent; -import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; -import org.apache.wss4j.stax.securityEvent.X509TokenSecurityEvent; -import org.apache.wss4j.stax.securityToken.SubjectAndPrincipalSecurityToken; +import org.apache.wss4j.api.stax.securityEvent.KerberosTokenSecurityEvent; +import org.apache.wss4j.api.stax.securityEvent.KeyValueTokenSecurityEvent; +import org.apache.wss4j.api.stax.securityEvent.SamlTokenSecurityEvent; +import org.apache.wss4j.api.stax.securityEvent.UsernameTokenSecurityEvent; +import org.apache.wss4j.api.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.api.stax.securityEvent.X509TokenSecurityEvent; +import org.apache.wss4j.api.stax.securityToken.SubjectAndPrincipalSecurityToken; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.apache.xml.security.stax.securityEvent.SecurityEventConstants.Event; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java index 14d18efa02..652daf8e7f 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java @@ -54,13 +54,13 @@ import org.apache.wss4j.common.cache.ReplayCache; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.ThreadLocalSecurityProvider; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.securityEvent.WSSecurityEventConstants; import org.apache.wss4j.stax.setup.ConfigurationConverter; import org.apache.wss4j.stax.setup.InboundWSSec; import org.apache.wss4j.stax.setup.WSSec; -import org.apache.wss4j.stax.validate.Validator; +import org.apache.wss4j.api.stax.validate.Validator; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.SecurityEvent; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java index 052b98f44c..623fa38e3c 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java @@ -48,8 +48,8 @@ import org.apache.wss4j.common.WSSPolicyException; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.ThreadLocalSecurityProvider; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.securityEvent.WSSecurityEventConstants; import org.apache.wss4j.stax.setup.ConfigurationConverter; import org.apache.wss4j.stax.setup.OutboundWSSec; import org.apache.wss4j.stax.setup.WSSec; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java index 0f36583fe8..0da6e1fecf 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java @@ -64,8 +64,8 @@ import org.apache.wss4j.common.util.Loader; import org.apache.wss4j.api.dom.WSConstants; import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.exceptions.XMLSecurityException; /** diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java index 76a6875f8c..145653e439 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java @@ -86,11 +86,11 @@ import org.apache.wss4j.policy.model.Wss11; import org.apache.wss4j.policy.model.X509Token; import org.apache.wss4j.policy.model.X509Token.TokenType; import org.apache.wss4j.policy.model.XPath; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSConstants.UsernameTokenPasswordType; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSConstants.UsernameTokenPasswordType; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.impl.securityToken.KerberosClientSecurityToken; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.algorithms.JCEMapper; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.ext.OutboundSecurityContext; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java index ef56e869f2..02afe1a888 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java @@ -52,9 +52,9 @@ import org.apache.wss4j.policy.model.SamlToken; import org.apache.wss4j.policy.model.SecurityContextToken; import org.apache.wss4j.policy.model.SpnegoContextToken; import org.apache.wss4j.policy.model.X509Token; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.stax.ext.OutboundSecurityContext; import org.apache.xml.security.stax.ext.SecurePart; import org.apache.xml.security.stax.ext.SecurePart.Modifier; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java index 08b2610d93..4145abb81b 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java @@ -63,10 +63,10 @@ import org.apache.wss4j.policy.model.SpnegoContextToken; import org.apache.wss4j.policy.model.SymmetricBinding; import org.apache.wss4j.policy.model.UsernameToken; import org.apache.wss4j.policy.model.X509Token; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.ext.OutboundSecurityContext; import org.apache.xml.security.stax.ext.SecurePart; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java index 2f7ef7e3b5..3513c2c0c4 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java @@ -60,8 +60,8 @@ import org.apache.wss4j.policy.model.TransportToken; import org.apache.wss4j.policy.model.UsernameToken; import org.apache.wss4j.policy.model.X509Token; import org.apache.wss4j.policy.model.XPath; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; import org.apache.xml.security.stax.ext.OutboundSecurityContext; import org.apache.xml.security.stax.ext.SecurePart; import org.apache.xml.security.stax.ext.SecurePart.Modifier; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java index a2b4508fe7..4e3b485e35 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java @@ -33,7 +33,7 @@ import org.apache.cxf.service.Service; import org.apache.cxf.transport.local.LocalTransportFactory; import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.crypto.CryptoFactory; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; import org.junit.Test; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java index 5f2b01f5a4..9e709d3b0d 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java @@ -37,8 +37,8 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.CryptoFactory; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.junit.Test; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java index 54856a7da2..84344297ff 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java @@ -34,7 +34,7 @@ import org.apache.cxf.transport.local.LocalTransportFactory; import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.bsp.BSPRule; import org.apache.wss4j.common.crypto.CryptoFactory; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; import org.junit.Test; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java index 37434dbae4..c75749dd6c 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java @@ -34,8 +34,8 @@ import org.apache.cxf.jaxws.JaxWsServerFactoryBean; import org.apache.cxf.service.Service; import org.apache.cxf.transport.local.LocalTransportFactory; import org.apache.wss4j.common.crypto.CryptoFactory; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; import org.apache.xml.security.stax.ext.SecurePart; import org.apache.xml.security.stax.ext.XMLSecurityConstants; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java index ab10d69701..da854ead4f 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java @@ -38,8 +38,8 @@ import org.apache.cxf.transport.local.LocalTransportFactory; import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; import org.apache.xml.security.stax.ext.SecurePart; import org.apache.xml.security.stax.ext.XMLSecurityConstants; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java index a7464875b5..76b0eba7ca 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java @@ -43,9 +43,9 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSPasswordCallback; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.stax.ext.SecurePart; import org.apache.xml.security.stax.ext.XMLSecurityConstants; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java index 960d268f13..29c9d88df0 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java @@ -35,9 +35,9 @@ import org.apache.cxf.service.Service; import org.apache.cxf.transport.local.LocalTransportFactory; import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.crypto.CryptoFactory; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.junit.Test; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java index 4091869cd1..8156ab6eb8 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java @@ -39,9 +39,9 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.CryptoFactory; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.stax.ext.SecurePart; import org.apache.xml.security.stax.ext.XMLSecurityConstants; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java index 320da87e08..29d0c60113 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java @@ -35,9 +35,9 @@ import org.apache.cxf.service.Service; import org.apache.cxf.transport.local.LocalTransportFactory; import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.crypto.CryptoFactory; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.junit.Test; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutWithAttachmentsTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutWithAttachmentsTest.java index 7db888644a..2a40f33a34 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutWithAttachmentsTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutWithAttachmentsTest.java @@ -55,7 +55,7 @@ import org.apache.cxf.message.MessageImpl; import org.apache.cxf.phase.PhaseInterceptorChain; import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.WSS4JConstants; -import org.apache.wss4j.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSConstants; import org.apache.xml.security.utils.Constants; import org.apache.xml.security.utils.EncryptionConstants; 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 475af937bf..41b2b1672a 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 @@ -23,7 +23,7 @@ import org.apache.wss4j.common.ext.WSSecurityException; 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.stax.securityToken.SamlSecurityToken; +import org.apache.wss4j.api.stax.securityToken.SamlSecurityToken; import org.apache.wss4j.stax.validate.SamlTokenValidatorImpl; import org.apache.wss4j.stax.validate.TokenContext; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; @@ -55,8 +55,8 @@ public class CustomStaxSamlValidator extends SamlTokenValidatorImpl { ) throws WSSecurityException { //jdk 1.6 compiler bug? http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6302954 //type parameters of <T>T cannot be determined; no unique maximal instance exists for type variable T with - // upper bounds org.apache.wss4j.stax.securityToken.SamlSecurityToken, - // org.apache.wss4j.stax.securityToken.SamlSecurityToken, + // upper bounds org.apache.wss4j.api.stax.securityToken.SamlSecurityToken, + // org.apache.wss4j.api.stax.securityToken.SamlSecurityToken, // org.apache.xml.security.stax.ext.securityToken.InboundSecurityToken //works fine on jdk 1.7 final SamlSecurityToken token = diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java index 94ee746408..cf3e2cb702 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java @@ -41,7 +41,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.dom.saml.builder.SAML1Constants; import org.apache.wss4j.dom.saml.builder.SAML2Constants; import org.apache.wss4j.api.dom.WSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; import org.junit.Test; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java index c367d9b9dc..5ff419fe0f 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java @@ -46,9 +46,9 @@ import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.dom.saml.builder.SAML1Constants; import org.apache.wss4j.dom.saml.builder.SAML2Constants; import org.apache.wss4j.api.dom.WSConstants; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants; import org.junit.Test; diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java index e1ad078993..f0ef869f74 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java @@ -64,8 +64,8 @@ import org.apache.wss4j.dom.saml.SamlAssertionWrapper; import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; -import org.apache.wss4j.stax.securityToken.SamlSecurityToken; +import org.apache.wss4j.api.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.api.stax.securityToken.SamlSecurityToken; import org.apache.xml.security.exceptions.XMLSecurityException; /** diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java index c981a3843e..34ceb56e86 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java @@ -43,7 +43,7 @@ import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.api.dom.message.token.SecurityContextToken; -import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.api.stax.securityEvent.WSSecurityEventConstants; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.securityEvent.AbstractSecuredElementSecurityEvent; import org.apache.xml.security.stax.securityEvent.SecurityEvent; diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java index d13cc86c7b..08d30befb9 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java @@ -49,7 +49,7 @@ import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.message.WSSecEncrypt; -import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.api.stax.securityEvent.WSSecurityEventConstants; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.securityEvent.AbstractSecuredElementSecurityEvent; import org.apache.xml.security.stax.securityEvent.SecurityEvent; 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 59aa754537..3630fd1b05 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 @@ -27,8 +27,8 @@ import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.saml.SamlAssertionWrapper; import org.apache.wss4j.stax.impl.securityToken.SamlSecurityTokenImpl; -import org.apache.wss4j.stax.securityToken.SamlSecurityToken; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.api.stax.securityToken.SamlSecurityToken; +import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants; import org.apache.wss4j.stax.validate.SamlTokenValidatorImpl; import org.apache.wss4j.stax.validate.TokenContext; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java index 996f591cd2..99384b0bb8 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java @@ -57,9 +57,9 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.api.dom.WSConstants; import org.apache.wss4j.dom.handler.HandlerAction; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.api.stax.ext.WSSConstants; +import org.apache.wss4j.api.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants; import org.example.contract.doubleit.DoubleItPortType; import org.junit.BeforeClass; 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 8f731a0ff1..1321981cf5 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 @@ -25,7 +25,7 @@ import org.apache.cxf.common.security.SimpleGroup; 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.stax.securityToken.UsernameSecurityToken; +import org.apache.wss4j.api.stax.securityToken.UsernameSecurityToken; import org.apache.wss4j.stax.validate.TokenContext; import org.apache.wss4j.stax.validate.UsernameTokenValidatorImpl; import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
