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 321370ed586cb52a5d074d4d291d42d09e144fe7 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Mon Jun 30 09:16:56 2025 +0100 Getting ws-security to compile after SAML changes --- parent/pom.xml | 2 +- rt/security-saml/pom.xml | 3 ++- .../saml/interceptor/WSS4JBasicAuthValidator.java | 19 ++++++++----------- .../cxf/ws/security/kerberos/KerberosClient.java | 4 ++-- .../interceptors/IssuedTokenInterceptorProvider.java | 4 ++-- .../policy/interceptors/NegotiationUtils.java | 6 +++--- .../ws/security/policy/interceptors/STSInvoker.java | 2 +- .../interceptors/SecureConversationInInterceptor.java | 4 ++-- .../interceptors/SpnegoContextTokenInInterceptor.java | 4 ++-- .../interceptors/SpnegoTokenInterceptorProvider.java | 2 +- .../cxf/ws/security/trust/AbstractSTSClient.java | 8 ++++---- .../org/apache/cxf/ws/security/trust/STSClient.java | 2 +- .../apache/cxf/ws/security/trust/STSLoginModule.java | 10 +++++----- .../ws/security/trust/STSSamlAssertionValidator.java | 6 +++--- .../cxf/ws/security/trust/STSStaxTokenValidator.java | 4 ++-- .../cxf/ws/security/trust/STSTokenValidator.java | 17 ++++++++++++----- .../delegation/ReceivedTokenCallbackHandler.java | 4 ++-- .../trust/delegation/WSSUsernameCallbackHandler.java | 2 +- .../ws/security/wss4j/AbstractTokenInterceptor.java | 2 +- ...bstractUsernameTokenAuthenticatingInterceptor.java | 14 +++++++------- .../ws/security/wss4j/AbstractWSS4JInterceptor.java | 2 +- .../ws/security/wss4j/AlgorithmSuiteTranslater.java | 2 +- .../wss4j/BinarySecurityTokenInterceptor.java | 10 +++++----- .../cxf/ws/security/wss4j/CXFCallbackLookup.java | 2 +- .../apache/cxf/ws/security/wss4j/CXFRequestData.java | 6 +++--- .../cxf/ws/security/wss4j/CryptoCoverageChecker.java | 6 +++--- .../cxf/ws/security/wss4j/CryptoCoverageUtil.java | 2 +- .../security/wss4j/DefaultCryptoCoverageChecker.java | 2 +- .../wss4j/DefaultWSS4JSecurityContextCreator.java | 4 ++-- .../security/wss4j/PolicyBasedWSS4JInInterceptor.java | 13 +++++++------ .../wss4j/PolicyBasedWSS4JOutInterceptor.java | 4 ++-- .../cxf/ws/security/wss4j/SamlTokenInterceptor.java | 14 +++++++------- .../ws/security/wss4j/StaxCryptoCoverageChecker.java | 2 +- .../ws/security/wss4j/UsernameTokenInterceptor.java | 16 ++++++++-------- .../cxf/ws/security/wss4j/WSS4JInInterceptor.java | 14 +++++++------- .../cxf/ws/security/wss4j/WSS4JOutInterceptor.java | 8 ++++---- .../org/apache/cxf/ws/security/wss4j/WSS4JUtils.java | 4 ++-- .../wss4j/policyhandlers/AbstractBindingBuilder.java | 18 +++++++++--------- .../policyhandlers/AsymmetricBindingHandler.java | 12 ++++++------ .../wss4j/policyhandlers/SymmetricBindingHandler.java | 12 ++++++------ .../wss4j/policyhandlers/TransportBindingHandler.java | 8 ++++---- .../wss4j/policyhandlers/WSSecurityTokenHolder.java | 4 ++-- .../AbstractBindingPolicyValidator.java | 8 ++++---- .../policyvalidators/AbstractSamlPolicyValidator.java | 4 ++-- .../AbstractSupportingTokenPolicyValidator.java | 8 ++++---- .../AlgorithmSuitePolicyValidator.java | 8 ++++---- .../AsymmetricBindingPolicyValidator.java | 4 ++-- .../EndorsingEncryptedTokenPolicyValidator.java | 2 +- .../EndorsingTokenPolicyValidator.java | 2 +- .../policyvalidators/IssuedTokenPolicyValidator.java | 4 ++-- .../KerberosTokenPolicyValidator.java | 6 +++--- .../wss4j/policyvalidators/LayoutPolicyValidator.java | 6 +++--- .../policyvalidators/PolicyValidatorParameters.java | 4 ++-- .../policyvalidators/SamlTokenPolicyValidator.java | 4 ++-- .../SecuredElementsPolicyValidator.java | 2 +- .../policyvalidators/SecuredPartsPolicyValidator.java | 2 +- .../SecurityContextTokenPolicyValidator.java | 4 ++-- .../SignedEndorsingEncryptedTokenPolicyValidator.java | 2 +- .../SignedEndorsingTokenPolicyValidator.java | 2 +- .../SymmetricBindingPolicyValidator.java | 4 ++-- .../UsernameTokenPolicyValidator.java | 4 ++-- .../wss4j/policyvalidators/WSS11PolicyValidator.java | 4 ++-- .../policyvalidators/X509TokenPolicyValidator.java | 4 ++-- .../trust/AuthPolicyValidatingInterceptorTest.java | 4 ++-- .../ws/security/wss4j/AbstractPolicySecurityTest.java | 6 +++--- .../security/wss4j/AttachmentCallbackHandlerTest.java | 2 +- .../apache/cxf/ws/security/wss4j/CustomProcessor.java | 19 ++++++++++++++----- .../ws/security/wss4j/SecurityActionTokenTest.java | 6 +++--- .../apache/cxf/ws/security/wss4j/WSS4JInOutTest.java | 6 +++--- .../ws/security/wss4j/WSS4JOutInterceptorTest.java | 9 ++++----- .../wss4j/saml/AbstractSAMLCallbackHandler.java | 2 +- .../ws/security/wss4j/saml/CustomSamlValidator.java | 8 ++++---- .../cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java | 2 +- .../ws/security/wss4j/saml/PolicyBasedSamlTest.java | 2 +- .../cxf/ws/security/wss4j/saml/SamlTokenTest.java | 4 ++-- .../cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java | 2 +- 76 files changed, 229 insertions(+), 215 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 59d6e0f75a..48f3e6a09d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -234,7 +234,7 @@ <cxf.woodstox.core.version>7.1.1</cxf.woodstox.core.version> <cxf.woodstox.stax2-api.version>4.2.1</cxf.woodstox.stax2-api.version> <cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version> - <cxf.jakarta.wss4j.version>4.0.0</cxf.jakarta.wss4j.version> + <cxf.jakarta.wss4j.version>4.0.1-SNAPSHOT</cxf.jakarta.wss4j.version> <cxf.xmlschema.version>2.3.1</cxf.xmlschema.version> <cxf.xnio.version>3.8.16.Final</cxf.xnio.version> <cxf.zest.version>2.1</cxf.zest.version> diff --git a/rt/security-saml/pom.xml b/rt/security-saml/pom.xml index be8e42f2a6..efa5b40944 100644 --- a/rt/security-saml/pom.xml +++ b/rt/security-saml/pom.xml @@ -44,7 +44,8 @@ </dependency> <dependency> <groupId>org.apache.wss4j</groupId> - <artifactId>wss4j-ws-security-dom</artifactId> + <artifactId>wss4j-ws-security-saml</artifactId> + <version>${cxf.jakarta.wss4j.version}</version> <exclusions> <exclusion> <groupId>org.bouncycastle</groupId> diff --git a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java index dfefd999d8..eb084e7478 100644 --- a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java +++ b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java @@ -37,14 +37,13 @@ import org.apache.cxf.rt.security.saml.utils.SAMLUtils; import org.apache.cxf.rt.security.utils.SecurityUtils; import org.apache.cxf.security.SecurityContext; import org.apache.wss4j.common.WSS4JConstants; +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.common.dom.validate.Validator; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.WSUsernameTokenPrincipalImpl; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -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.dom.validate.UsernameTokenValidator; -import org.apache.wss4j.dom.validate.Validator; /** * An abstract class containing some functionality to validate a username + password received @@ -119,9 +118,9 @@ public abstract class WSS4JBasicAuthValidator { } protected SecurityContext createSecurityContext(Message msg, Credential credential) { - SamlAssertionWrapper samlAssertion = credential.getTransformedToken(); + SamlAssertionWrapper samlAssertion = (SamlAssertionWrapper)credential.getTransformedToken(); if (samlAssertion == null) { - samlAssertion = credential.getSamlAssertion(); + samlAssertion = (SamlAssertionWrapper)credential.getSamlAssertion(); } if (samlAssertion != null) { String roleAttributeName = @@ -145,10 +144,8 @@ public abstract class WSS4JBasicAuthValidator { } public Validator getValidator() { - if (validator != null) { - return validator; - } - return new UsernameTokenValidator(); + return validator; + // TODO return new UsernameTokenValidator(); } public void setValidator(Validator validator) { diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java index c926aa9677..2dec4c28e4 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java @@ -33,8 +33,8 @@ import org.apache.cxf.phase.PhaseInterceptorChain; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.wss4j.common.util.KeyUtils; -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; import org.apache.xml.security.utils.XMLUtils; import org.ietf.jgss.GSSCredential; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java index 6099eabe21..167bcea52d 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java @@ -51,8 +51,8 @@ import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor; import org.apache.cxf.ws.security.wss4j.policyvalidators.PolicyValidatorParameters; import org.apache.cxf.ws.security.wss4j.policyvalidators.SecurityPolicyValidator; import org.apache.cxf.ws.security.wss4j.policyvalidators.ValidatorUtils; -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.apache.wss4j.policy.SP11Constants; 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 7aa0562d2d..161296a215 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 @@ -53,11 +53,11 @@ import org.apache.neethi.Assertion; import org.apache.neethi.Policy; import org.apache.wss4j.common.derivedKey.ConversationConstants; import org.apache.wss4j.common.ext.WSSecurityException; -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.apache.wss4j.dom.message.token.SecurityContextToken; +import org.apache.wss4j.common.dom.message.token.SecurityContextToken; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.model.AbstractBinding; import org.apache.wss4j.policy.model.AlgorithmSuite; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java index eba9f1ca0a..3e7cf31845 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java @@ -53,7 +53,7 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.token.Reference; import org.apache.wss4j.common.token.SecurityTokenReference; import org.apache.wss4j.common.util.DateUtil; -import org.apache.wss4j.dom.message.token.SecurityContextToken; +import org.apache.wss4j.common.dom.message.token.SecurityContextToken; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.utils.XMLUtils; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java index 23f284d2f1..58fa73cf15 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java @@ -65,8 +65,8 @@ import org.apache.neethi.All; import org.apache.neethi.Assertion; import org.apache.neethi.ExactlyOne; import org.apache.neethi.Policy; -import org.apache.wss4j.dom.engine.WSSConfig; -import org.apache.wss4j.dom.message.token.SecurityContextToken; +import org.apache.wss4j.common.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.message.token.SecurityContextToken; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.SPConstants.IncludeTokenType; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenInInterceptor.java index 0492c1088d..70113dca6a 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenInInterceptor.java @@ -58,8 +58,8 @@ import org.apache.neethi.ExactlyOne; import org.apache.neethi.Policy; import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.spnego.SpnegoTokenContext; -import org.apache.wss4j.dom.engine.WSSConfig; -import org.apache.wss4j.dom.message.token.SecurityContextToken; +import org.apache.wss4j.common.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.message.token.SecurityContextToken; import org.apache.wss4j.policy.SPConstants; import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.utils.XMLUtils; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoTokenInterceptorProvider.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoTokenInterceptorProvider.java index ec239e9019..ba4191e3d6 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoTokenInterceptorProvider.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoTokenInterceptorProvider.java @@ -32,7 +32,7 @@ import org.apache.cxf.ws.security.trust.STSClient; import org.apache.neethi.All; import org.apache.neethi.ExactlyOne; import org.apache.neethi.Policy; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.model.AlgorithmSuite; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java index d95294581e..3c3a5b6292 100755 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java @@ -126,10 +126,10 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.token.Reference; 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.WSDocInfo; +import org.apache.wss4j.common.dom.engine.WSSConfig; +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.SPConstants; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java index a160b4cd67..9ba694f59d 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java @@ -39,7 +39,7 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.cxf.ws.security.wss4j.AttachmentCallbackHandler; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.XMLUtils; -import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.common.dom.WSConstants; import org.apache.wss4j.dom.util.WSSecurityUtil; /** diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java index d11f4a5dc5..d6d77c2b15 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java @@ -60,9 +60,9 @@ import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor; import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.util.Loader; -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.RequestData; +import org.apache.wss4j.common.dom.message.token.UsernameToken; +import org.apache.wss4j.common.dom.validate.Credential; /** * A JAAS LoginModule for authenticating a Username/Password to the STS. It can be configured @@ -335,9 +335,9 @@ public class STSLoginModule implements LoginModule { } private Set<Principal> getRoles(Message msg, Credential credential) { - SamlAssertionWrapper samlAssertion = credential.getTransformedToken(); + SamlAssertionWrapper samlAssertion = (SamlAssertionWrapper)credential.getTransformedToken(); if (samlAssertion == null) { - samlAssertion = credential.getSamlAssertion(); + samlAssertion = (SamlAssertionWrapper)credential.getSamlAssertion(); } if (samlAssertion != null) { String roleAttributeName = null; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSSamlAssertionValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSSamlAssertionValidator.java index 662849baa8..fa44d1ec06 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSSamlAssertionValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSSamlAssertionValidator.java @@ -25,9 +25,9 @@ import java.util.logging.Logger; import org.apache.cxf.common.logging.LogUtils; 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; /** * This class validates a SAML Assertion by invoking the SamlAssertionValidator in WSS4J. It 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 dced3df872..bbc0a88817 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 @@ -43,8 +43,8 @@ import org.apache.wss4j.common.token.PKIPathSecurity; import org.apache.wss4j.common.token.X509Security; import org.apache.wss4j.common.util.AttachmentUtils; import org.apache.wss4j.common.util.UsernameTokenUtil; -import org.apache.wss4j.dom.message.token.KerberosSecurity; -import org.apache.wss4j.dom.message.token.UsernameToken; +import org.apache.wss4j.common.dom.message.token.KerberosSecurity; +import org.apache.wss4j.common.dom.message.token.UsernameToken; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.impl.securityToken.KerberosServiceSecurityTokenImpl; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java index df76fb086f..b63e9629fe 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java @@ -26,6 +26,7 @@ import java.util.List; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; +import javax.xml.namespace.QName; import org.w3c.dom.Element; @@ -39,9 +40,9 @@ import org.apache.cxf.ws.security.trust.delegation.DelegationCallback; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.SAMLTokenPrincipalImpl; 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.Validator; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.validate.Credential; +import org.apache.wss4j.common.dom.validate.Validator; /** * A WSS4J-based Validator to validate a received WS-Security credential by dispatching @@ -88,12 +89,12 @@ public class STSTokenValidator implements Validator { Element tokenElement = null; int hash = 0; if (credential.getSamlAssertion() != null) { - SamlAssertionWrapper assertion = credential.getSamlAssertion(); + SamlAssertionWrapper assertion = (SamlAssertionWrapper)credential.getSamlAssertion(); byte[] signatureValue = assertion.getSignatureValue(); if (signatureValue != null && signatureValue.length > 0) { hash = Arrays.hashCode(signatureValue); } - tokenElement = credential.getSamlAssertion().getElement(); + tokenElement = ((SamlAssertionWrapper)credential.getSamlAssertion()).getElement(); } else if (credential.getUsernametoken() != null) { tokenElement = credential.getUsernametoken().getElement(); hash = credential.getUsernametoken().hashCode(); @@ -268,4 +269,10 @@ public class STSTokenValidator implements Validator { } } + @Override + public QName[] getSupportedQNames() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getSupportedQNames'"); + } + } diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java index 05d4bb9b2a..ca516631c7 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java @@ -38,8 +38,8 @@ import org.apache.cxf.phase.PhaseInterceptorChain; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.token.PKIPathSecurity; import org.apache.wss4j.common.token.X509Security; -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; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java index 063e32ffbd..0a55fe74ed 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java @@ -32,7 +32,7 @@ import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.message.Message; import org.apache.cxf.rt.security.utils.SecurityUtils; import org.apache.cxf.ws.security.SecurityConstants; -import org.apache.wss4j.dom.message.token.UsernameToken; +import org.apache.wss4j.common.dom.message.token.UsernameToken; /** * This CallbackHandler implementation obtains a username via the jaxws property diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java index 742c72be20..aaa714c32d 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java @@ -51,7 +51,7 @@ import org.apache.cxf.ws.security.policy.PolicyUtils; import org.apache.cxf.ws.security.tokenstore.TokenStore; import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.ext.WSPasswordCallback; -import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.common.dom.WSConstants; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.model.AbstractToken; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractUsernameTokenAuthenticatingInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractUsernameTokenAuthenticatingInterceptor.java index e31414dc98..de7c5f72b8 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractUsernameTokenAuthenticatingInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractUsernameTokenAuthenticatingInterceptor.java @@ -42,10 +42,10 @@ import org.apache.cxf.message.Message; import org.apache.cxf.phase.PhaseInterceptorChain; import org.apache.cxf.security.SecurityContext; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.validate.UsernameTokenValidator; @@ -207,7 +207,7 @@ public abstract class AbstractUsernameTokenAuthenticatingInterceptor extends WSS @Override protected void verifyCustomPassword( - org.apache.wss4j.dom.message.token.UsernameToken usernameToken, + org.apache.wss4j.common.dom.message.token.UsernameToken usernameToken, RequestData data ) throws WSSecurityException { AbstractUsernameTokenAuthenticatingInterceptor.this.setSubject( @@ -217,7 +217,7 @@ public abstract class AbstractUsernameTokenAuthenticatingInterceptor extends WSS @Override protected void verifyPlaintextPassword( - org.apache.wss4j.dom.message.token.UsernameToken usernameToken, + org.apache.wss4j.common.dom.message.token.UsernameToken usernameToken, RequestData data ) throws WSSecurityException { AbstractUsernameTokenAuthenticatingInterceptor.this.setSubject( @@ -227,7 +227,7 @@ public abstract class AbstractUsernameTokenAuthenticatingInterceptor extends WSS @Override protected void verifyDigestPassword( - org.apache.wss4j.dom.message.token.UsernameToken usernameToken, + org.apache.wss4j.common.dom.message.token.UsernameToken usernameToken, RequestData data ) throws WSSecurityException { if (!supportDigestPasswords) { @@ -245,7 +245,7 @@ public abstract class AbstractUsernameTokenAuthenticatingInterceptor extends WSS @Override protected void verifyUnknownPassword( - org.apache.wss4j.dom.message.token.UsernameToken usernameToken, + org.apache.wss4j.common.dom.message.token.UsernameToken usernameToken, RequestData data ) throws WSSecurityException { AbstractUsernameTokenAuthenticatingInterceptor.this.setSubject( diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java index e66212bf89..a77b1c554f 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java @@ -40,7 +40,7 @@ import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.PasswordEncryptor; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandler; public abstract class AbstractWSS4JInterceptor extends WSHandler implements SoapInterceptor, diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AlgorithmSuiteTranslater.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AlgorithmSuiteTranslater.java index 370093e785..09bcf5eb4e 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AlgorithmSuiteTranslater.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AlgorithmSuiteTranslater.java @@ -32,7 +32,7 @@ import org.apache.cxf.ws.security.policy.custom.DefaultAlgorithmSuiteLoader; import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.AlgorithmSuite; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.model.AbstractBinding; import org.apache.wss4j.policy.model.AbstractSecurityAssertion; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/BinarySecurityTokenInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/BinarySecurityTokenInterceptor.java index 0928307e60..a92d549df8 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/BinarySecurityTokenInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/BinarySecurityTokenInterceptor.java @@ -38,11 +38,11 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.cxf.ws.security.tokenstore.TokenStore; import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.WSConstants; -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.WSConstants; +import org.apache.wss4j.common.dom.WSDocInfo; +import org.apache.wss4j.common.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.processor.BinarySecurityTokenProcessor; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CXFCallbackLookup.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CXFCallbackLookup.java index d49451904b..5c11683aa4 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CXFCallbackLookup.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CXFCallbackLookup.java @@ -22,7 +22,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.apache.cxf.helpers.DOMUtils; -import org.apache.wss4j.dom.callback.DOMCallbackLookup; +import org.apache.wss4j.common.dom.callback.DOMCallbackLookup; import org.apache.wss4j.dom.util.WSSecurityUtil; /** diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CXFRequestData.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CXFRequestData.java index ce8cda6860..95e0b32382 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CXFRequestData.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CXFRequestData.java @@ -27,9 +27,9 @@ import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.common.classloader.ClassLoaderUtils; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.validate.Validator; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.validate.Validator; public class CXFRequestData extends RequestData { diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java index 1d0d830a5b..fca4ac8ac4 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java @@ -49,9 +49,9 @@ import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageScope; import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType; import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.WSDataRef; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.WSDataRef; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageUtil.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageUtil.java index 0467717ea6..452e7b7f96 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageUtil.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageUtil.java @@ -39,7 +39,7 @@ import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.helpers.MapNamespaceContext; import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.WSDataRef; +import org.apache.wss4j.common.WSDataRef; /** diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageChecker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageChecker.java index b809587290..7f8684e282 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageChecker.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageChecker.java @@ -22,7 +22,7 @@ package org.apache.cxf.ws.security.wss4j; import org.apache.cxf.ws.addressing.Names; import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageScope; import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType; -import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.common.dom.WSConstants; /** * This utility extends the CryptoCoverageChecker to provide an easy way to check to see diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultWSS4JSecurityContextCreator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultWSS4JSecurityContextCreator.java index c3721eacaf..586aa7fa71 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultWSS4JSecurityContextCreator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultWSS4JSecurityContextCreator.java @@ -42,8 +42,8 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.token.PKIPathSecurity; import org.apache.wss4j.common.token.X509Security; -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; /** diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java index ca8ada8fae..9e6255334a 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java @@ -57,12 +57,13 @@ import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.PasswordEncryptor; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.WSDataRef; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.util.XMLUtils; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.WSDataRef; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.apache.wss4j.dom.message.token.Timestamp; +import org.apache.wss4j.common.dom.message.token.Timestamp; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.SP13Constants; @@ -148,7 +149,7 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor { Attr attr = elem.getAttributeNodeNS(soapNamespace, actorLocal); String hActor = (attr != null) ? attr.getValue() : null; - if (WSSecurityUtil.isActorEqual(actor, hActor)) { + if (XMLUtils.isActorEqual(actor, hActor)) { return true; } } diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java index d423419fcf..baa63da961 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java @@ -54,8 +54,8 @@ import org.apache.neethi.Policy; import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.crypto.ThreadLocalSecurityProvider; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.engine.WSSConfig; -import org.apache.wss4j.dom.message.WSSecHeader; +import org.apache.wss4j.common.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.message.WSSecHeader; import org.apache.wss4j.policy.model.AbstractBinding; import org.apache.wss4j.policy.model.AsymmetricBinding; import org.apache.wss4j.policy.model.SymmetricBinding; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java index f3de0d9cfc..dece303238 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java @@ -57,15 +57,15 @@ 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.common.saml.bean.Version; -import org.apache.wss4j.dom.WSConstants; -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.WSConstants; +import org.apache.wss4j.common.dom.WSDocInfo; +import org.apache.wss4j.common.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.apache.wss4j.dom.processor.SAMLTokenProcessor; -import org.apache.wss4j.dom.saml.DOMSAMLUtil; +import org.apache.wss4j.common.saml.processor.SAMLTokenProcessor; +import org.apache.wss4j.common.saml.DOMSAMLUtil; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.model.AbstractToken; import org.apache.wss4j.policy.model.SamlToken; 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 9e3056add2..52dbc60dcd 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 @@ -32,7 +32,7 @@ import org.apache.cxf.phase.Phase; 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.dom.WSConstants; +import org.apache.wss4j.common.dom.WSConstants; import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; import org.apache.xml.security.stax.securityEvent.AbstractSecuredElementSecurityEvent; import org.apache.xml.security.stax.securityEvent.SecurityEvent; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java index bd3f303bf5..b82eb6a942 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java @@ -59,11 +59,11 @@ import org.apache.wss4j.common.principal.SAMLTokenPrincipalImpl; import org.apache.wss4j.common.principal.UsernameTokenPrincipal; import org.apache.wss4j.common.principal.WSUsernameTokenPrincipalImpl; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.WSConstants; -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.WSConstants; +import org.apache.wss4j.common.dom.WSDocInfo; +import org.apache.wss4j.common.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.message.WSSecUsernameToken; @@ -152,7 +152,7 @@ public class UsernameTokenInterceptor extends AbstractTokenInterceptor { } private SecurityContext createSecurityContext(Message msg, - SamlAssertionWrapper samlAssertion) { + SamlAssertionWrapper samlAssertion) throws WSSecurityException { String roleAttributeName = (String)SecurityUtils.getSecurityPropertyValue(SecurityConstants.SAML_ROLE_ATTRIBUTENAME, msg); if (roleAttributeName == null || roleAttributeName.length() == 0) { @@ -241,8 +241,8 @@ public class UsernameTokenInterceptor extends AbstractTokenInterceptor { boolean allowNamespaceQualifiedPWDTypes) throws WSSecurityException, Base64DecodingException { BSPEnforcer bspEnforcer = new org.apache.wss4j.common.bsp.BSPEnforcer(!bspCompliant); - org.apache.wss4j.dom.message.token.UsernameToken ut = - new org.apache.wss4j.dom.message.token.UsernameToken(tokenElement, allowNamespaceQualifiedPWDTypes, + org.apache.wss4j.common.dom.message.token.UsernameToken ut = + new org.apache.wss4j.common.dom.message.token.UsernameToken(tokenElement, allowNamespaceQualifiedPWDTypes, bspEnforcer); WSUsernameTokenPrincipalImpl principal = new WSUsernameTokenPrincipalImpl(ut.getName(), ut.isHashed()); diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java index e6c26001aa..e797817922 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java @@ -73,18 +73,18 @@ import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.ThreadLocalSecurityProvider; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.WSDataRef; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.WSDataRef; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; -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.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.apache.wss4j.dom.processor.Processor; +import org.apache.wss4j.common.dom.processor.Processor; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.dom.validate.NoOpValidator; -import org.apache.wss4j.dom.validate.Validator; +import org.apache.wss4j.common.dom.validate.Validator; import org.apache.xml.security.c14n.InvalidCanonicalizerException; /** diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java index a315bec59f..1290a4eb28 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java @@ -45,11 +45,11 @@ import org.apache.cxf.phase.PhaseInterceptor; import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.crypto.ThreadLocalSecurityProvider; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.action.Action; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.dom.action.Action; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.handler.HandlerAction; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.xml.security.c14n.InvalidCanonicalizerException; 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 0b6af58aaa..57c3d191fc 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 @@ -61,8 +61,8 @@ import org.apache.wss4j.common.crypto.JasyptPasswordEncryptor; import org.apache.wss4j.common.crypto.PasswordEncryptor; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.Loader; -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; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java index 59d76a1f91..f9bbbb0e2a 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java @@ -106,18 +106,18 @@ import org.apache.wss4j.common.token.X509Security; import org.apache.wss4j.common.util.Loader; import org.apache.wss4j.common.util.UsernameTokenUtil; import org.apache.wss4j.common.util.XMLUtils; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.WSDocInfo; -import org.apache.wss4j.dom.callback.CallbackLookup; -import org.apache.wss4j.dom.engine.WSSConfig; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.dom.WSDocInfo; +import org.apache.wss4j.common.dom.callback.CallbackLookup; +import org.apache.wss4j.common.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.apache.wss4j.dom.message.WSSecBase; +import org.apache.wss4j.common.dom.message.WSSecBase; import org.apache.wss4j.dom.message.WSSecDKSign; import org.apache.wss4j.dom.message.WSSecEncryptedKey; -import org.apache.wss4j.dom.message.WSSecHeader; -import org.apache.wss4j.dom.message.WSSecSignature; +import org.apache.wss4j.common.dom.message.WSSecHeader; +import org.apache.wss4j.common.dom.message.WSSecSignature; import org.apache.wss4j.dom.message.WSSecSignatureConfirmation; import org.apache.wss4j.dom.message.WSSecTimestamp; import org.apache.wss4j.dom.message.WSSecUsernameToken; @@ -1539,7 +1539,7 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle ((X509Security)bstToken).setX509Certificate(encCert); bstToken.addWSUNamespace(); bstToken.setID(wssConfig.getIdAllocator().createSecureId("X509-", encCert)); - WSSecurityUtil.prependChildElement( + XMLUtils.prependChildElement( secHeader.getSecurityHeaderElement(), bstToken.getElement() ); bstElement = bstToken.getElement(); diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java index a491213204..a42c77483b 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java @@ -58,18 +58,18 @@ import org.apache.wss4j.common.derivedKey.ConversationConstants; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.util.KeyUtils; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.apache.wss4j.dom.message.WSSecBase; +import org.apache.wss4j.common.dom.message.WSSecBase; import org.apache.wss4j.dom.message.WSSecDKEncrypt; import org.apache.wss4j.dom.message.WSSecDKSign; import org.apache.wss4j.dom.message.WSSecEncrypt; import org.apache.wss4j.dom.message.WSSecEncryptedKey; -import org.apache.wss4j.dom.message.WSSecHeader; -import org.apache.wss4j.dom.message.WSSecSignature; +import org.apache.wss4j.common.dom.message.WSSecHeader; +import org.apache.wss4j.common.dom.message.WSSecSignature; import org.apache.wss4j.dom.message.WSSecTimestamp; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.model.AbstractSymmetricAsymmetricBinding; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java index 1fa284f1bb..0a2a459cbe 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java @@ -58,18 +58,18 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.token.SecurityTokenReference; import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.common.util.UsernameTokenUtil; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.apache.wss4j.dom.message.WSSecBase; +import org.apache.wss4j.common.dom.message.WSSecBase; import org.apache.wss4j.dom.message.WSSecDKEncrypt; import org.apache.wss4j.dom.message.WSSecDKSign; import org.apache.wss4j.dom.message.WSSecEncrypt; import org.apache.wss4j.dom.message.WSSecEncryptedKey; -import org.apache.wss4j.dom.message.WSSecHeader; -import org.apache.wss4j.dom.message.WSSecSignature; +import org.apache.wss4j.common.dom.message.WSSecHeader; +import org.apache.wss4j.common.dom.message.WSSecSignature; import org.apache.wss4j.dom.message.WSSecTimestamp; import org.apache.wss4j.dom.message.WSSecUsernameToken; import org.apache.wss4j.policy.SPConstants; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java index 322327e695..561ec3dafa 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java @@ -56,12 +56,12 @@ import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.token.SecurityTokenReference; import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.common.util.UsernameTokenUtil; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.message.WSSecDKSign; import org.apache.wss4j.dom.message.WSSecEncryptedKey; -import org.apache.wss4j.dom.message.WSSecHeader; -import org.apache.wss4j.dom.message.WSSecSignature; +import org.apache.wss4j.common.dom.message.WSSecHeader; +import org.apache.wss4j.common.dom.message.WSSecSignature; import org.apache.wss4j.dom.message.WSSecTimestamp; import org.apache.wss4j.dom.message.WSSecUsernameToken; import org.apache.wss4j.policy.SP11Constants; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/WSSecurityTokenHolder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/WSSecurityTokenHolder.java index bd6d93dbe5..abbb15a369 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/WSSecurityTokenHolder.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/WSSecurityTokenHolder.java @@ -20,8 +20,8 @@ package org.apache.cxf.ws.security.wss4j.policyhandlers; import org.apache.cxf.ws.security.tokenstore.SecurityToken; -import org.apache.wss4j.dom.message.WSSecBase; -import org.apache.wss4j.dom.message.WSSecHeader; +import org.apache.wss4j.common.dom.message.WSSecBase; +import org.apache.wss4j.common.dom.message.WSSecHeader; /** * diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java index 20df586762..5add54b911 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java @@ -37,11 +37,11 @@ import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.token.BinarySecurity; import org.apache.wss4j.common.token.PKIPathSecurity; import org.apache.wss4j.common.token.X509Security; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.WSDataRef; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.WSDataRef; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.apache.wss4j.dom.message.token.Timestamp; +import org.apache.wss4j.common.dom.message.token.Timestamp; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.model.AbstractSymmetricAsymmetricBinding; import org.apache.wss4j.policy.model.AbstractSymmetricAsymmetricBinding.ProtectionOrder; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSamlPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSamlPolicyValidator.java index 12ce7d41f5..d2528056ec 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSamlPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSamlPolicyValidator.java @@ -24,8 +24,8 @@ import java.util.List; import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.saml.DOMSAMLUtil; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.saml.DOMSAMLUtil; /** * Some abstract functionality for validating SAML Assertions diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java index 76bdc2efec..07e940565b 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java @@ -56,11 +56,11 @@ import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.token.BinarySecurity; import org.apache.wss4j.common.token.PKIPathSecurity; import org.apache.wss4j.common.token.X509Security; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.WSDataRef; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.WSDataRef; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.apache.wss4j.dom.message.token.KerberosSecurity; +import org.apache.wss4j.common.dom.message.token.KerberosSecurity; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.model.AbstractSecuredParts; import org.apache.wss4j.policy.model.AbstractSecurityAssertion; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java index 0a4b1f8890..37e62bbad6 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java @@ -35,10 +35,10 @@ import org.apache.cxf.ws.security.policy.PolicyUtils; import org.apache.cxf.ws.security.policy.custom.DefaultAlgorithmSuiteLoader; import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.principal.WSDerivedKeyTokenPrincipal; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.WSDataRef; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.transform.STRTransform; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.WSDataRef; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.transform.STRTransform; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.model.AlgorithmSuite; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AsymmetricBindingPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AsymmetricBindingPolicyValidator.java index 10c696cf88..0d1b254fda 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AsymmetricBindingPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AsymmetricBindingPolicyValidator.java @@ -28,8 +28,8 @@ import javax.xml.namespace.QName; import org.apache.cxf.ws.policy.AssertionInfo; import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.cxf.ws.security.policy.PolicyUtils; -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.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.model.AbstractToken; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingEncryptedTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingEncryptedTokenPolicyValidator.java index 6924422c9e..17c1ca8f9d 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingEncryptedTokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingEncryptedTokenPolicyValidator.java @@ -26,7 +26,7 @@ import javax.xml.namespace.QName; import org.apache.cxf.ws.policy.AssertionInfo; import org.apache.cxf.ws.security.policy.PolicyUtils; -import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.common.dom.WSConstants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.model.AbstractToken; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingTokenPolicyValidator.java index a8ab8c14c3..51e1742f06 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingTokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingTokenPolicyValidator.java @@ -23,7 +23,7 @@ import java.util.Collection; import java.util.List; import org.apache.cxf.ws.policy.AssertionInfo; -import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.common.dom.WSConstants; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.model.AbstractToken; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/IssuedTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/IssuedTokenPolicyValidator.java index b217cd8327..76a0ce4652 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/IssuedTokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/IssuedTokenPolicyValidator.java @@ -39,8 +39,8 @@ import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.token.BinarySecurity; -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.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.SPConstants; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java index 70ee722cd6..57caadb0f8 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java @@ -37,9 +37,9 @@ import org.apache.cxf.ws.security.tokenstore.TokenStoreUtils; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.token.BinarySecurity; import org.apache.wss4j.common.util.KeyUtils; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.message.token.KerberosSecurity; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.message.token.KerberosSecurity; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.SPConstants; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java index 146bc34cca..e4fba2eda1 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java @@ -37,9 +37,9 @@ import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.token.BinarySecurity; import org.apache.wss4j.common.token.PKIPathSecurity; import org.apache.wss4j.common.token.X509Security; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.WSDataRef; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.WSDataRef; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.model.Layout; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/PolicyValidatorParameters.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/PolicyValidatorParameters.java index e7895f1194..c4d6d02337 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/PolicyValidatorParameters.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/PolicyValidatorParameters.java @@ -26,8 +26,8 @@ import org.w3c.dom.Element; import org.apache.cxf.message.Message; import org.apache.cxf.ws.policy.AssertionInfoMap; -import org.apache.wss4j.dom.WSDataRef; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.WSDataRef; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerResult; /** diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java index e77dd1603c..7265864118 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java @@ -31,8 +31,8 @@ import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.policy.PolicyUtils; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.saml.DOMSAMLUtil; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.saml.DOMSAMLUtil; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.SPConstants; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredElementsPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredElementsPolicyValidator.java index 6de4a8eb51..1bfc3cf9a8 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredElementsPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredElementsPolicyValidator.java @@ -37,7 +37,7 @@ import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil; import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageScope; import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.WSDataRef; +import org.apache.wss4j.common.WSDataRef; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.model.RequiredElements; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredPartsPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredPartsPolicyValidator.java index c558783e87..68a8910741 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredPartsPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredPartsPolicyValidator.java @@ -33,7 +33,7 @@ import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil; import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageScope; import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.WSDataRef; +import org.apache.wss4j.common.WSDataRef; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.SPConstants; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityContextTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityContextTokenPolicyValidator.java index c39f2f194f..3dcba0042c 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityContextTokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityContextTokenPolicyValidator.java @@ -25,8 +25,8 @@ import java.util.List; import org.apache.cxf.ws.policy.AssertionInfo; import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.cxf.ws.security.policy.PolicyUtils; -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.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.model.SecurityContextToken; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java index 62d8c2ea63..40c9d468ee 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java @@ -26,7 +26,7 @@ import javax.xml.namespace.QName; import org.apache.cxf.ws.policy.AssertionInfo; import org.apache.cxf.ws.security.policy.PolicyUtils; -import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.common.dom.WSConstants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.model.AbstractToken; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java index 4e5dd6628e..9c58af9fb2 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java @@ -23,7 +23,7 @@ import java.util.Collection; import java.util.List; import org.apache.cxf.ws.policy.AssertionInfo; -import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.common.dom.WSConstants; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.model.AbstractToken; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SymmetricBindingPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SymmetricBindingPolicyValidator.java index 6cb3ea88d6..16ba75b3f8 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SymmetricBindingPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SymmetricBindingPolicyValidator.java @@ -25,8 +25,8 @@ import java.util.List; import org.apache.cxf.ws.policy.AssertionInfo; import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.cxf.ws.security.policy.PolicyUtils; -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.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.model.SymmetricBinding; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/UsernameTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/UsernameTokenPolicyValidator.java index 140237a726..d584ed4a55 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/UsernameTokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/UsernameTokenPolicyValidator.java @@ -27,8 +27,8 @@ import javax.xml.namespace.QName; import org.apache.cxf.ws.policy.AssertionInfo; import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.cxf.ws.security.policy.PolicyUtils; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.message.token.UsernameToken; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.message.token.UsernameToken; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.SP13Constants; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java index 08ae8bf8db..73962a8b3f 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java @@ -28,8 +28,8 @@ import org.apache.cxf.message.MessageUtils; import org.apache.cxf.ws.policy.AssertionInfo; import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.cxf.ws.security.policy.PolicyUtils; -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.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.SPConstants; diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java index cf9eb5f621..5a7ea5ee90 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java @@ -39,8 +39,8 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.token.BinarySecurity; import org.apache.wss4j.common.token.X509Security; import org.apache.wss4j.common.util.XMLUtils; -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.str.STRParser; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java index 391ef9b22e..2a74f0e46e 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java @@ -22,8 +22,8 @@ import org.apache.cxf.configuration.security.AuthorizationPolicy; import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageImpl; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.message.token.UsernameToken; -import org.apache.wss4j.dom.validate.Credential; +import org.apache.wss4j.common.dom.message.token.UsernameToken; +import org.apache.wss4j.common.dom.validate.Credential; import org.junit.Test; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java index 352c167d84..a9b1b1db88 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java @@ -72,9 +72,9 @@ import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.crypto.CryptoType; import org.apache.wss4j.common.saml.OpenSAMLUtil; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.WSDataRef; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.WSDataRef; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.util.WSSecurityUtil; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandlerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandlerTest.java index 52d0833e6d..7fc9e0f1cd 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandlerTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandlerTest.java @@ -30,7 +30,7 @@ import org.apache.cxf.attachment.AttachmentImpl; import org.apache.cxf.message.Attachment; import org.apache.wss4j.common.ext.AttachmentRequestCallback; import org.apache.wss4j.common.util.AttachmentUtils; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.junit.Test; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomProcessor.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomProcessor.java index 2ad534d927..0f75d96e63 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomProcessor.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomProcessor.java @@ -19,11 +19,14 @@ package org.apache.cxf.ws.security.wss4j; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.WSConstants; -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.validate.Validator; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; + +import javax.xml.namespace.QName; + +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.processor.Processor; +import org.apache.wss4j.common.dom.validate.Validator; /** * a custom processor that inserts itself into the results vector @@ -45,4 +48,10 @@ public class CustomProcessor implements Processor { // } + @Override + public QName[] getSupportedQNames() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getSupportedQNames'"); + } + } diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java index 4ba908471c..179527cc5a 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java @@ -33,9 +33,9 @@ import org.apache.cxf.staxutils.StaxUtils; import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.EncryptionActionToken; import org.apache.wss4j.common.SignatureActionToken; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.WSDataRef; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.WSDataRef; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.HandlerAction; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java index afdef21757..87ffa14b2e 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java @@ -50,9 +50,9 @@ import org.apache.cxf.staxutils.StaxUtils; import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.principal.UsernameTokenPrincipal; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.WSDataRef; -import org.apache.wss4j.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.WSConstants; +import org.apache.wss4j.common.WSDataRef; +import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.xml.security.utils.Constants; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java index 2d623075c8..55f1e85ba8 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java @@ -31,9 +31,9 @@ import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.SecurityActionToken; import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.common.dom.WSConstants; import org.apache.wss4j.dom.action.UsernameTokenAction; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandler; import org.junit.Test; @@ -227,12 +227,11 @@ public class WSS4JOutInterceptorTest extends AbstractSecurityTest { private int executions; @Override - public void execute(WSHandler handler, SecurityActionToken actionToken, - RequestData reqData) throws WSSecurityException { + public void execute(SecurityActionToken actionToken, RequestData reqData) throws WSSecurityException { this.executions++; reqData.setPwType(WSS4JConstants.PW_TEXT); - super.execute(handler, actionToken, reqData); + super.execute(actionToken, reqData); } public int getExecutions() { diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/AbstractSAMLCallbackHandler.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/AbstractSAMLCallbackHandler.java index 158e5f811b..cf78cb5886 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/AbstractSAMLCallbackHandler.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/AbstractSAMLCallbackHandler.java @@ -43,7 +43,7 @@ import org.apache.wss4j.common.saml.bean.KeyInfoBean; import org.apache.wss4j.common.saml.bean.KeyInfoBean.CERT_IDENTIFIER; import org.apache.wss4j.common.saml.bean.SubjectBean; import org.apache.wss4j.common.util.KeyUtils; -import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.common.dom.WSConstants; import org.apache.wss4j.dom.message.WSSecEncryptedKey; /** diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/CustomSamlValidator.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/CustomSamlValidator.java index 3bbb781422..ccf86c9e6d 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/CustomSamlValidator.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/CustomSamlValidator.java @@ -24,9 +24,9 @@ import org.apache.wss4j.common.saml.OpenSAMLUtil; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.saml.builder.SAML2Constants; -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; /** * A trivial custom Validator for a SAML Assertion. It makes sure that the issuer is @@ -58,7 +58,7 @@ public class CustomSamlValidator extends SamlAssertionValidator { // // Do some custom validation on the assertion // - SamlAssertionWrapper assertion = credential.getSamlAssertion(); + SamlAssertionWrapper assertion = (SamlAssertionWrapper)credential.getSamlAssertion(); if (!"www.example.com".equals(assertion.getIssuerString())) { throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity"); } 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 1c151bb06e..e2446c0fe1 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 @@ -40,7 +40,7 @@ import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.saml.builder.SAML2Constants; -import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.common.dom.WSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.junit.Test; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java index 506115bc46..5f381ee7e2 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java @@ -35,7 +35,7 @@ import org.apache.cxf.ws.security.wss4j.AbstractPolicySecurityTest; import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType; import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JInInterceptor; import org.apache.wss4j.dom.util.WSSecurityUtil; -import org.apache.wss4j.dom.validate.SamlAssertionValidator; +import org.apache.wss4j.common.saml.validate.SamlAssertionValidator; import org.apache.wss4j.policy.SP12Constants; import org.junit.Test; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java index b724728817..8cb54ca16d 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java @@ -54,8 +54,8 @@ import org.apache.wss4j.common.principal.SAMLTokenPrincipal; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.saml.builder.SAML2Constants; -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; 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 ac7d20b915..357b3846f2 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 @@ -45,7 +45,7 @@ import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.saml.builder.SAML2Constants; -import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.common.dom.WSConstants; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
