This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch coheigea/saml-refactor-new in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
commit bf284d36b140122330824ad5c2b8c3c7c421d0e5 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Fri Jun 20 10:53:50 2025 +0100 Moving RequestData, WSSConfig, Action, Processor and Validator to ws-security-common --- .../apache/wss4j/integration/test/kerberos/KerberosTest.java | 2 +- .../main/java/org/apache/wss4j/common/dom}/RequestData.java | 7 +++---- .../java/org/apache/wss4j/common}/dom/action/Action.java | 4 ++-- .../java/org/apache/wss4j/common}/dom/engine/WSSConfig.java | 12 ++++++------ .../org/apache/wss4j/common}/dom/processor/Processor.java | 4 ++-- .../org/apache/wss4j/common}/dom/validate/Validator.java | 5 ++--- .../org/apache/wss4j/dom/action/AbstractDerivedAction.java | 2 +- .../main/java/org/apache/wss4j/dom/action/ActionUtils.java | 2 +- .../java/org/apache/wss4j/dom/action/CustomTokenAction.java | 3 ++- .../java/org/apache/wss4j/dom/action/EncryptionAction.java | 3 ++- .../org/apache/wss4j/dom/action/EncryptionDerivedAction.java | 3 ++- .../org/apache/wss4j/dom/action/SAMLTokenSignedAction.java | 3 ++- .../org/apache/wss4j/dom/action/SAMLTokenUnsignedAction.java | 3 ++- .../java/org/apache/wss4j/dom/action/SignatureAction.java | 3 ++- .../apache/wss4j/dom/action/SignatureConfirmationAction.java | 3 ++- .../org/apache/wss4j/dom/action/SignatureDerivedAction.java | 3 ++- .../java/org/apache/wss4j/dom/action/TimestampAction.java | 3 ++- .../org/apache/wss4j/dom/action/UsernameTokenAction.java | 3 ++- .../apache/wss4j/dom/action/UsernameTokenSignedAction.java | 3 ++- .../java/org/apache/wss4j/dom/engine/WSSecurityEngine.java | 5 +++-- .../main/java/org/apache/wss4j/dom/handler/WSHandler.java | 3 ++- .../main/java/org/apache/wss4j/dom/message/WSSecBase.java | 2 +- .../apache/wss4j/dom/message/WSSecSecurityContextToken.java | 2 +- .../wss4j/dom/processor/BinarySecurityTokenProcessor.java | 5 +++-- .../apache/wss4j/dom/processor/DerivedKeyTokenProcessor.java | 3 ++- .../wss4j/dom/processor/EncryptedAssertionProcessor.java | 3 ++- .../apache/wss4j/dom/processor/EncryptedDataProcessor.java | 5 +++-- .../apache/wss4j/dom/processor/EncryptedKeyProcessor.java | 3 ++- .../apache/wss4j/dom/processor/ReferenceListProcessor.java | 3 ++- .../org/apache/wss4j/dom/processor/SAMLTokenProcessor.java | 5 +++-- .../wss4j/dom/processor/SecurityContextTokenProcessor.java | 5 +++-- .../wss4j/dom/processor/SignatureConfirmationProcessor.java | 3 ++- .../org/apache/wss4j/dom/processor/SignatureProcessor.java | 5 +++-- .../org/apache/wss4j/dom/processor/TimestampProcessor.java | 5 +++-- .../apache/wss4j/dom/processor/UsernameTokenProcessor.java | 5 +++-- .../org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java | 2 +- .../java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java | 2 +- .../org/apache/wss4j/dom/str/DerivedKeyTokenSTRParser.java | 2 +- .../java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java | 2 +- .../java/org/apache/wss4j/dom/str/STRParserParameters.java | 2 +- .../main/java/org/apache/wss4j/dom/str/STRParserUtil.java | 4 ++-- .../org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java | 4 ++-- .../java/org/apache/wss4j/dom/str/SignatureSTRParser.java | 4 ++-- .../main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java | 4 ++-- .../wss4j/dom/validate/JAASUsernameTokenValidator.java | 3 ++- .../apache/wss4j/dom/validate/KerberosTokenValidator.java | 3 ++- .../java/org/apache/wss4j/dom/validate/NoOpValidator.java | 3 ++- .../apache/wss4j/dom/validate/SamlAssertionValidator.java | 2 +- .../apache/wss4j/dom/validate/SignatureTrustValidator.java | 3 ++- .../org/apache/wss4j/dom/validate/TimestampValidator.java | 3 ++- .../apache/wss4j/dom/validate/UsernameTokenValidator.java | 3 ++- ...tion.Action => org.apache.wss4j.common.dom.action.Action} | 0 ...essor => org.apache.wss4j.common.dom.processor.Processor} | 0 ...idator => org.apache.wss4j.common.dom.validate.Validator} | 0 .../test/java/org/apache/wss4j/dom/common/CustomAction.java | 4 ++-- .../test/java/org/apache/wss4j/dom/common/CustomHandler.java | 2 +- .../java/org/apache/wss4j/dom/common/CustomProcessor.java | 4 ++-- .../wss4j/dom/common/CustomSamlAssertionValidator.java | 2 +- .../wss4j/dom/components/crypto/CertificateStoreTest.java | 4 ++-- .../org/apache/wss4j/dom/components/crypto/CryptoTest.java | 2 +- .../apache/wss4j/dom/components/crypto/WSSConfigTest.java | 2 +- .../java/org/apache/wss4j/dom/handler/CallbackRefTest.java | 3 ++- .../apache/wss4j/dom/handler/CustomActionProcessorTest.java | 4 ++-- .../java/org/apache/wss4j/dom/handler/CustomTokenTest.java | 4 ++-- .../apache/wss4j/dom/handler/SecurityActionTokenTest.java | 4 ++-- .../apache/wss4j/dom/handler/SignatureConfirmationTest.java | 1 + .../org/apache/wss4j/dom/handler/SignatureUTAliasTest.java | 4 ++-- .../java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java | 4 ++-- .../apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java | 3 ++- .../java/org/apache/wss4j/dom/message/AttachmentTest.java | 4 ++-- .../java/org/apache/wss4j/dom/message/CertErrorTest.java | 2 +- .../org/apache/wss4j/dom/message/DerivedKeyActionTest.java | 4 ++-- .../java/org/apache/wss4j/dom/message/DerivedKeyTest.java | 2 +- .../apache/wss4j/dom/message/EncryptedDataInHeaderTest.java | 2 +- .../wss4j/dom/message/EncryptionAlgorithmSuiteTest.java | 4 ++-- .../java/org/apache/wss4j/dom/message/EncryptionCRLTest.java | 4 ++-- .../java/org/apache/wss4j/dom/message/EncryptionGCMTest.java | 4 ++-- .../org/apache/wss4j/dom/message/EncryptionPartsTest.java | 2 +- .../java/org/apache/wss4j/dom/message/EncryptionTest.java | 4 ++-- .../org/apache/wss4j/dom/message/ModifiedRequestTest.java | 2 +- .../apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java | 2 +- .../org/apache/wss4j/dom/message/PasswordEncryptorTest.java | 4 ++-- .../java/org/apache/wss4j/dom/message/PasswordTypeTest.java | 2 +- .../test/java/org/apache/wss4j/dom/message/ReplayTest.java | 4 ++-- .../dom/message/RequireSignedEncryptedDataElementsTest.java | 4 ++-- .../java/org/apache/wss4j/dom/message/SKISignatureTest.java | 2 +- .../java/org/apache/wss4j/dom/message/STRSignatureTest.java | 2 +- .../java/org/apache/wss4j/dom/message/SignatureAKITest.java | 2 +- .../wss4j/dom/message/SignatureAlgorithmSuiteTest.java | 4 ++-- .../java/org/apache/wss4j/dom/message/SignatureCRLTest.java | 4 ++-- .../wss4j/dom/message/SignatureCertConstraintsTest.java | 4 ++-- .../java/org/apache/wss4j/dom/message/SignatureCertTest.java | 4 ++-- .../apache/wss4j/dom/message/SignatureEncryptionTest.java | 4 ++-- .../dom/message/SignatureIssuerCertConstraintsTest.java | 4 ++-- .../org/apache/wss4j/dom/message/SignatureKeyValueTest.java | 4 ++-- .../org/apache/wss4j/dom/message/SignaturePartsTest.java | 4 ++-- .../apache/wss4j/dom/message/SignaturePrefixListTest.java | 2 +- .../org/apache/wss4j/dom/message/SignatureProviderTest.java | 4 ++-- .../java/org/apache/wss4j/dom/message/SignatureTest.java | 4 ++-- .../org/apache/wss4j/dom/message/SignatureWSS651Test.java | 2 +- .../java/org/apache/wss4j/dom/message/SignedBSTTest.java | 4 ++-- .../org/apache/wss4j/dom/message/SymmetricSignatureTest.java | 4 ++-- .../java/org/apache/wss4j/dom/message/TimestampTest.java | 4 ++-- .../java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java | 4 ++-- .../java/org/apache/wss4j/dom/message/UTSignatureTest.java | 4 ++-- .../java/org/apache/wss4j/dom/message/UsernameTokenTest.java | 2 +- .../java/org/apache/wss4j/dom/message/XOPAttachmentTest.java | 4 ++-- .../org/apache/wss4j/dom/message/token/BSTKerberosTest.java | 6 +++--- .../wss4j/dom/message/token/BinarySecurityTokenTest.java | 2 +- .../org/apache/wss4j/dom/message/token/ReferenceTest.java | 2 +- .../wss4j/dom/message/token/SecurityTokenReferenceTest.java | 2 +- .../apache/wss4j/dom/message/token/WCFUsernameTokenTest.java | 4 ++-- .../test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java | 2 +- .../test/java/org/apache/wss4j/dom/misc/PrincipalTest.java | 6 +++--- .../apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java | 2 +- .../org/apache/wss4j/dom/processor/RecipientKeyInfoTest.java | 4 ++-- .../apache/wss4j/dom/processor/ReferenceListDataRefTest.java | 2 +- .../org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java | 4 ++-- .../test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java | 4 ++-- .../java/org/apache/wss4j/dom/saml/SamlConditionsTest.java | 4 ++-- .../java/org/apache/wss4j/dom/saml/SamlNegativeTest.java | 4 ++-- .../java/org/apache/wss4j/dom/saml/SamlReferenceTest.java | 4 ++-- .../java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java | 4 ++-- .../apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java | 4 ++-- .../java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java | 4 ++-- .../java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java | 4 ++-- .../test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java | 4 ++-- .../test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java | 4 ++-- .../org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java | 4 ++-- .../org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java | 2 +- .../java/org/apache/wss4j/dom/util/WSSecurityUtilTest.java | 2 +- .../java/org/apache/wss4j/dom/validate/ValidatorTest.java | 5 +++-- .../java/org/apache/wss4j/stax/test/AbstractTestBase.java | 4 ++-- .../java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java | 2 +- .../org/apache/wss4j/stax/test/SecurityContextTokenTest.java | 2 +- .../java/org/apache/wss4j/stax/test/SignatureCRLTest.java | 2 +- .../apache/wss4j/stax/test/SignatureCertConstaintsTest.java | 2 +- .../wss4j/stax/test/SignatureIssuerCertConstaintsTest.java | 2 +- .../apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java | 2 +- 139 files changed, 245 insertions(+), 212 deletions(-) diff --git a/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java b/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java index ab92be3eb..723e42cbd 100644 --- a/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java +++ b/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java @@ -53,7 +53,7 @@ import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.message.WSSecEncrypt; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/RequestData.java similarity index 99% rename from ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java rename to ws-security-common/src/main/java/org/apache/wss4j/common/dom/RequestData.java index f4d923114..70bc5b1b8 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java +++ b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/RequestData.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.wss4j.dom.handler; +package org.apache.wss4j.common.dom; import java.security.Provider; import java.security.cert.Certificate; @@ -44,10 +44,9 @@ import org.apache.wss4j.common.crypto.AlgorithmSuite; 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.common.dom.WSDocInfo; import org.apache.wss4j.common.dom.message.WSSecHeader; -import org.apache.wss4j.dom.engine.WSSConfig; -import org.apache.wss4j.dom.validate.Validator; +import org.apache.wss4j.common.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.validate.Validator; import org.apache.xml.security.encryption.Serializer; /** diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/Action.java b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/action/Action.java similarity index 92% rename from ws-security-dom/src/main/java/org/apache/wss4j/dom/action/Action.java rename to ws-security-common/src/main/java/org/apache/wss4j/common/dom/action/Action.java index a4d6be291..7a0c320f4 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/Action.java +++ b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/action/Action.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.wss4j.dom.action; +package org.apache.wss4j.common.dom.action; import org.apache.wss4j.common.SecurityActionToken; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.handler.RequestData; /** * Interface for all actions diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/engine/WSSConfig.java similarity index 98% rename from ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java rename to ws-security-common/src/main/java/org/apache/wss4j/common/dom/engine/WSSConfig.java index 9067f27e9..a2e2e8349 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java +++ b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/engine/WSSConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.wss4j.dom.engine; +package org.apache.wss4j.common.dom.engine; import java.security.AccessController; import java.security.PrivilegedAction; @@ -29,19 +29,19 @@ import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.namespace.QName; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.action.Action; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.WSProviderConfig; import org.apache.wss4j.common.dom.WsuIdAllocator; +import org.apache.wss4j.common.dom.action.Action; +import org.apache.wss4j.common.dom.processor.Processor; import org.apache.wss4j.common.dom.resolvers.ResolverAttachment; +import org.apache.wss4j.common.dom.validate.Validator; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.WSCurrentTimeSource; import org.apache.wss4j.common.util.WSTimeSource; import org.apache.wss4j.common.dom.transform.AttachmentCiphertextTransform; import org.apache.wss4j.common.dom.transform.AttachmentCompleteSignatureTransformProvider; import org.apache.wss4j.common.dom.transform.AttachmentContentSignatureTransformProvider; -import org.apache.wss4j.dom.processor.Processor; -import org.apache.wss4j.dom.validate.Validator; import org.apache.xml.security.stax.impl.util.IDGenerator; import org.apache.xml.security.transforms.Transform; import org.apache.xml.security.utils.resolver.ResourceResolver; @@ -211,7 +211,7 @@ public final class WSSConfig { static { try { - Transform.register(WSConstants.SWA_ATTACHMENT_CIPHERTEXT_TRANS, + Transform.register(WSS4JConstants.SWA_ATTACHMENT_CIPHERTEXT_TRANS, AttachmentCiphertextTransform.class); } catch (Exception e) { LOG.debug(e.getMessage(), e); diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/Processor.java b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/processor/Processor.java similarity index 92% rename from ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/Processor.java rename to ws-security-common/src/main/java/org/apache/wss4j/common/dom/processor/Processor.java index 8c40d97cf..9e6d1960b 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/Processor.java +++ b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/processor/Processor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.wss4j.dom.processor; +package org.apache.wss4j.common.dom.processor; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.handler.RequestData; import org.w3c.dom.Element; import java.util.List; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/Validator.java b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/validate/Validator.java similarity index 92% rename from ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/Validator.java rename to ws-security-common/src/main/java/org/apache/wss4j/common/dom/validate/Validator.java index 99bceda67..c17667e99 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/Validator.java +++ b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/validate/Validator.java @@ -17,14 +17,13 @@ * under the License. */ -package org.apache.wss4j.dom.validate; +package org.apache.wss4j.common.dom.validate; import javax.xml.namespace.QName; -import org.apache.wss4j.common.dom.validate.Credential; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.handler.RequestData; /** * This interface describes a pluggable way of validating credentials that have been extracted diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java index d5dedc33f..708f26aa6 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java @@ -31,7 +31,7 @@ import org.apache.wss4j.common.dom.message.WSSecHeader; 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.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.message.WSSecDerivedKeyBase; import org.apache.wss4j.dom.message.WSSecEncryptedKey; import org.apache.wss4j.common.dom.message.token.SecurityContextToken; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/ActionUtils.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/ActionUtils.java index 0b900cd92..f0b4e8d7d 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/ActionUtils.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/ActionUtils.java @@ -25,7 +25,7 @@ import javax.security.auth.callback.CallbackHandler; 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.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; public final class ActionUtils { diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/CustomTokenAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/CustomTokenAction.java index 0138cefe0..94f34eb1d 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/CustomTokenAction.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/CustomTokenAction.java @@ -23,7 +23,8 @@ import org.apache.wss4j.common.SecurityActionToken; 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.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.action.Action; import org.w3c.dom.Element; import javax.security.auth.callback.Callback; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionAction.java index 82438dea5..6f506bc6e 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionAction.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionAction.java @@ -34,7 +34,8 @@ import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.action.Action; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.message.WSSecEncrypt; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java index 673d7a71d..3d0eb2880 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java @@ -35,7 +35,8 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.action.Action; import org.apache.wss4j.dom.message.WSSecDKEncrypt; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.w3c.dom.Document; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java index 78f575593..4b561df53 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java @@ -29,7 +29,8 @@ import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.saml.SAMLCallback; import org.apache.wss4j.common.saml.SAMLUtil; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.action.Action; import org.apache.wss4j.dom.saml.WSSecSignatureSAML; public class SAMLTokenSignedAction implements Action { diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenUnsignedAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenUnsignedAction.java index 497d17550..018d10bf7 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenUnsignedAction.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenUnsignedAction.java @@ -27,7 +27,8 @@ import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.saml.SAMLCallback; import org.apache.wss4j.common.saml.SAMLUtil; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.action.Action; import org.apache.wss4j.dom.message.WSSecSAMLToken; public class SAMLTokenUnsignedAction implements Action { diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java index 9b5f317ae..3b5473440 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java @@ -30,7 +30,8 @@ import org.apache.wss4j.common.WSEncryptionPart; 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.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.action.Action; import org.apache.wss4j.dom.message.WSSecSignature; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.w3c.dom.Document; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java index e06c50a3a..971c49471 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java @@ -25,7 +25,8 @@ import org.apache.wss4j.common.SecurityActionToken; import org.apache.wss4j.common.SignatureActionToken; import org.apache.wss4j.common.WSEncryptionPart; 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.common.dom.action.Action; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.message.WSSecSignatureConfirmation; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java index 2e83c4ccc..70bc2d21f 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java @@ -36,7 +36,8 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.action.Action; import org.apache.wss4j.dom.message.WSSecDKSign; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.w3c.dom.Document; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/TimestampAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/TimestampAction.java index 5cd1aff6c..eb0ca7dae 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/TimestampAction.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/TimestampAction.java @@ -22,7 +22,8 @@ package org.apache.wss4j.dom.action; import org.apache.wss4j.common.SecurityActionToken; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.action.Action; import org.apache.wss4j.dom.message.WSSecTimestamp; public class TimestampAction implements Action { diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java index d953708ab..ebf413d43 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java @@ -25,7 +25,8 @@ import org.apache.wss4j.common.SecurityActionToken; 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.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.action.Action; import org.apache.wss4j.dom.message.WSSecUsernameToken; public class UsernameTokenAction implements Action { diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java index a30f7310c..e67150db7 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java @@ -32,7 +32,8 @@ import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.UsernameTokenUtil; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.action.Action; import org.apache.wss4j.dom.message.WSSecUsernameToken; import org.apache.wss4j.dom.message.WSSecSignature; import org.apache.wss4j.dom.util.WSSecurityUtil; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngine.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngine.java index 18acda868..6e5555379 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngine.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngine.java @@ -29,15 +29,16 @@ import javax.xml.namespace.QName; import org.apache.wss4j.common.bsp.BSPRule; import org.apache.wss4j.common.crypto.Crypto; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.callback.CallbackLookup; import org.apache.wss4j.common.dom.callback.DOMCallbackLookup; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.dom.WSDocInfo; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; 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.saml.DOMSAMLUtil; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.w3c.dom.Document; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java index c81f5d6b6..f87b04028 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java @@ -28,8 +28,9 @@ import java.util.regex.PatternSyntaxException; import javax.security.auth.callback.CallbackHandler; import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.dom.WSDocInfo; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.EncryptionActionToken; import org.apache.wss4j.common.SignatureActionToken; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java index 65cd75436..64786d0fd 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java @@ -27,7 +27,7 @@ import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.dom.WSDocInfo; import org.apache.wss4j.common.dom.WsuIdAllocator; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSecurityContextToken.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSecurityContextToken.java index 54885fc1c..131e873d0 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSecurityContextToken.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSecurityContextToken.java @@ -24,7 +24,7 @@ import org.apache.wss4j.common.dom.message.WSSecHeader; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.common.derivedKey.ConversationConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.common.dom.message.token.SecurityContextToken; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/BinarySecurityTokenProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/BinarySecurityTokenProcessor.java index 14a19d584..a053f21fd 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/BinarySecurityTokenProcessor.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/BinarySecurityTokenProcessor.java @@ -33,11 +33,12 @@ import org.apache.wss4j.common.token.X509Security; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.dom.message.token.KerberosSecurity; +import org.apache.wss4j.common.dom.processor.Processor; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.common.dom.validate.Credential; -import org.apache.wss4j.dom.validate.Validator; +import org.apache.wss4j.common.dom.validate.Validator; import org.w3c.dom.Element; /** diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/DerivedKeyTokenProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/DerivedKeyTokenProcessor.java index 340a72b32..cda89e77f 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/DerivedKeyTokenProcessor.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/DerivedKeyTokenProcessor.java @@ -30,8 +30,9 @@ import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.crypto.AlgorithmSuite; import org.apache.wss4j.common.crypto.AlgorithmSuiteValidator; 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.common.dom.message.token.DerivedKeyToken; +import org.apache.wss4j.common.dom.processor.Processor; import org.apache.wss4j.dom.str.DerivedKeyTokenSTRParser; import org.apache.wss4j.dom.str.STRParser; import org.apache.wss4j.dom.str.STRParserParameters; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedAssertionProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedAssertionProcessor.java index 3707c31e7..1e5ef0af6 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedAssertionProcessor.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedAssertionProcessor.java @@ -32,7 +32,8 @@ import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.WSDataRef; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.processor.Processor; +import org.apache.wss4j.common.dom.RequestData; /** * This will process incoming <code>saml2:EncryptedAssertion</code> elements. diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java index 4ad6402d7..74ff7a68b 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java @@ -38,9 +38,10 @@ import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.WSDataRef; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.processor.Processor; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.str.STRParser; import org.apache.wss4j.dom.str.STRParserParameters; import org.apache.wss4j.dom.str.STRParserResult; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java index cfa039e8b..555ecab23 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java @@ -66,7 +66,8 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.WSDataRef; import org.apache.wss4j.common.dom.WSDocInfo; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.processor.Processor; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.str.EncryptedKeySTRParser; import org.apache.wss4j.dom.str.STRParser; import org.apache.wss4j.dom.str.STRParserParameters; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java index f238f153f..c132f5c9d 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java @@ -43,7 +43,8 @@ import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.WSDataRef; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.processor.Processor; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.str.STRParser; import org.apache.wss4j.dom.str.STRParserParameters; import org.apache.wss4j.dom.str.STRParserResult; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java index 47d2e902b..198b3794f 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java @@ -46,11 +46,12 @@ import org.apache.wss4j.common.util.DOM2Writer; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.WSDataRef; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.processor.Processor; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor; import org.apache.wss4j.dom.util.EncryptionUtils; import org.apache.wss4j.common.dom.validate.Credential; -import org.apache.wss4j.dom.validate.Validator; +import org.apache.wss4j.common.dom.validate.Validator; import org.opensaml.xmlsec.signature.KeyInfo; import org.opensaml.xmlsec.signature.Signature; import org.w3c.dom.Element; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SecurityContextTokenProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SecurityContextTokenProcessor.java index 77915fee8..9385daec1 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SecurityContextTokenProcessor.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SecurityContextTokenProcessor.java @@ -24,10 +24,11 @@ import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.XMLUtils; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.dom.message.token.SecurityContextToken; +import org.apache.wss4j.common.dom.processor.Processor; import org.apache.wss4j.common.dom.validate.Credential; -import org.apache.wss4j.dom.validate.Validator; +import org.apache.wss4j.common.dom.validate.Validator; import org.w3c.dom.Element; import javax.security.auth.callback.Callback; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java index 7de7a1a7c..affbeec08 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java @@ -22,8 +22,9 @@ package org.apache.wss4j.dom.processor; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; 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.common.dom.message.token.SignatureConfirmation; +import org.apache.wss4j.common.dom.processor.Processor; import org.w3c.dom.Element; import java.util.List; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java index add2f9fba..90372a75a 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java @@ -67,8 +67,9 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.WSDataRef; import org.apache.wss4j.common.dom.WSDocInfo; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.dom.message.token.Timestamp; +import org.apache.wss4j.common.dom.processor.Processor; import org.apache.wss4j.dom.str.STRParser; import org.apache.wss4j.dom.str.STRParser.REFERENCE_TYPE; import org.apache.wss4j.dom.str.STRParserParameters; @@ -81,7 +82,7 @@ import org.apache.wss4j.dom.util.EncryptionUtils; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.dom.util.X509Util; import org.apache.wss4j.common.dom.validate.Credential; -import org.apache.wss4j.dom.validate.Validator; +import org.apache.wss4j.common.dom.validate.Validator; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java index 1086d77a3..bc37416d5 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java @@ -26,10 +26,11 @@ import javax.xml.namespace.QName; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.dom.message.token.Timestamp; +import org.apache.wss4j.common.dom.processor.Processor; import org.apache.wss4j.common.dom.validate.Credential; -import org.apache.wss4j.dom.validate.Validator; +import org.apache.wss4j.common.dom.validate.Validator; import org.w3c.dom.Element; public class TimestampProcessor implements Processor { diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java index f8d6e73bf..71d639d49 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java @@ -32,10 +32,11 @@ import org.apache.wss4j.common.cache.ReplayCache; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.dom.message.token.UsernameToken; +import org.apache.wss4j.common.dom.processor.Processor; import org.apache.wss4j.common.dom.validate.Credential; -import org.apache.wss4j.dom.validate.Validator; +import org.apache.wss4j.common.dom.validate.Validator; import org.apache.xml.security.utils.XMLUtils; public class UsernameTokenProcessor implements Processor { diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java index 2410d4f4b..92dc2bbdf 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java @@ -36,7 +36,7 @@ import org.apache.wss4j.common.saml.SAMLKeyInfoProcessor; import org.apache.wss4j.common.token.SecurityTokenReference; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.processor.EncryptedKeyProcessor; import org.apache.wss4j.dom.str.STRParser; import org.apache.wss4j.dom.str.STRParserParameters; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java index b3c0a9d1c..651adc012 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java @@ -50,7 +50,7 @@ import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.dom.WSDocInfo; import org.apache.wss4j.common.dom.message.WSSecHeader; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.message.WSSecSignature; import org.apache.wss4j.common.dom.transform.STRTransform; import org.apache.wss4j.dom.util.WSSecurityUtil; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/DerivedKeyTokenSTRParser.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/DerivedKeyTokenSTRParser.java index 98cb32952..191fae794 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/DerivedKeyTokenSTRParser.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/DerivedKeyTokenSTRParser.java @@ -35,7 +35,7 @@ import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor; /** diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java index 4f1089fe5..d215c6947 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java @@ -36,7 +36,7 @@ import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.dom.WSDocInfo; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor; import org.w3c.dom.Element; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserParameters.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserParameters.java index e897dc56c..492374030 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserParameters.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserParameters.java @@ -21,7 +21,7 @@ package org.apache.wss4j.dom.str; import org.w3c.dom.Element; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; /** * This class holds the parameters for parsing a SecurityTokenReference Element by a STRParser implementation. diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java index 9170e4289..dacebf6b6 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java @@ -39,9 +39,9 @@ import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.dom.WSDocInfo; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.dom.message.token.KerberosSecurity; -import org.apache.wss4j.dom.processor.Processor; +import org.apache.wss4j.common.dom.processor.Processor; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java index c3edb1624..41c25d082 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java @@ -38,10 +38,10 @@ import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.dom.WSDocInfo; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.dom.message.token.DerivedKeyToken; import org.apache.wss4j.common.dom.message.token.UsernameToken; -import org.apache.wss4j.dom.processor.Processor; +import org.apache.wss4j.common.dom.processor.Processor; import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor; import org.w3c.dom.Element; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java index 20898bed2..b30e21efc 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java @@ -45,11 +45,11 @@ import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.dom.WSDocInfo; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.dom.message.token.DerivedKeyToken; import org.apache.wss4j.common.dom.message.token.SecurityContextToken; import org.apache.wss4j.common.dom.message.token.UsernameToken; -import org.apache.wss4j.dom.processor.Processor; +import org.apache.wss4j.common.dom.processor.Processor; import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor; import org.w3c.dom.Element; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java index 0f6d91c82..163c2f241 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java @@ -20,14 +20,14 @@ package org.apache.wss4j.dom.util; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.dom.callback.CallbackLookup; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.AttachmentUtils; import org.apache.wss4j.common.util.XMLUtils; 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.w3c.dom.Attr; import org.w3c.dom.Document; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/JAASUsernameTokenValidator.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/JAASUsernameTokenValidator.java index 9298bd0bd..164e33de8 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/JAASUsernameTokenValidator.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/JAASUsernameTokenValidator.java @@ -28,8 +28,9 @@ import javax.xml.namespace.QName; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.NamePasswordCallbackHandler; 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.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.dom.message.token.UsernameToken; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/KerberosTokenValidator.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/KerberosTokenValidator.java index 4f84c66d1..f398bd410 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/KerberosTokenValidator.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/KerberosTokenValidator.java @@ -31,6 +31,7 @@ import javax.security.auth.login.LoginException; import javax.xml.namespace.QName; 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.ext.WSSecurityException.ErrorCode; import org.apache.wss4j.common.kerberos.KerberosServiceContext; @@ -38,7 +39,7 @@ import org.apache.wss4j.common.kerberos.KerberosServiceExceptionAction; import org.apache.wss4j.common.kerberos.KerberosTokenDecoder; import org.apache.wss4j.common.kerberos.KerberosTokenDecoderException; import org.apache.wss4j.common.token.BinarySecurity; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.dom.message.token.KerberosSecurity; /** diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/NoOpValidator.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/NoOpValidator.java index 07e2a82aa..30175cb0f 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/NoOpValidator.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/NoOpValidator.java @@ -23,8 +23,9 @@ package org.apache.wss4j.dom.validate; import javax.xml.namespace.QName; 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.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; /** * This class does not do any Validation at all. diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SamlAssertionValidator.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SamlAssertionValidator.java index 017b11b92..0f4807a5d 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SamlAssertionValidator.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SamlAssertionValidator.java @@ -33,7 +33,7 @@ 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.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.opensaml.saml.common.SAMLVersion; /** diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java index 0f5d336ed..07f217c11 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java @@ -28,9 +28,10 @@ import javax.xml.namespace.QName; import org.apache.wss4j.common.crypto.Crypto; 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.dom.WSConstants; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; /** * This class verifies trust in a credential used to verify a signature, which is extracted diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/TimestampValidator.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/TimestampValidator.java index 44aee3abb..1b9cff622 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/TimestampValidator.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/TimestampValidator.java @@ -21,9 +21,10 @@ package org.apache.wss4j.dom.validate; 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.dom.WSConstants; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import javax.xml.namespace.QName; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/UsernameTokenValidator.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/UsernameTokenValidator.java index 16bd74db1..5b951dfb6 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/UsernameTokenValidator.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/UsernameTokenValidator.java @@ -29,10 +29,11 @@ import javax.xml.namespace.QName; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.dom.validate.Credential; +import org.apache.wss4j.common.dom.validate.Validator; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.UsernameTokenUtil; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.dom.message.token.UsernameToken; import org.apache.xml.security.utils.XMLUtils; diff --git a/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.dom.action.Action b/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.action.Action similarity index 100% rename from ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.dom.action.Action rename to ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.action.Action diff --git a/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.dom.processor.Processor b/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.processor.Processor similarity index 100% rename from ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.dom.processor.Processor rename to ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.processor.Processor diff --git a/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.dom.validate.Validator b/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.validate.Validator similarity index 100% rename from ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.dom.validate.Validator rename to ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.validate.Validator diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomAction.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomAction.java index bf6ba716f..7d51202f9 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomAction.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomAction.java @@ -19,13 +19,13 @@ package org.apache.wss4j.dom.common; -import org.apache.wss4j.dom.action.Action; +import org.apache.wss4j.common.dom.action.Action; import java.util.Map; import org.apache.wss4j.common.SecurityActionToken; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; /** * a custom action that leaves a breadcumb diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomHandler.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomHandler.java index c453c210c..a0501428a 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomHandler.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomHandler.java @@ -23,7 +23,7 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.HandlerAction; import org.apache.wss4j.dom.handler.WSHandler; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.w3c.dom.Document; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomProcessor.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomProcessor.java index d8d64f3cf..f1c1df68c 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomProcessor.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomProcessor.java @@ -20,8 +20,8 @@ package org.apache.wss4j.dom.common; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.processor.Processor; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.processor.Processor; import org.apache.wss4j.dom.WSConstants; import javax.xml.namespace.QName; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomSamlAssertionValidator.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomSamlAssertionValidator.java index 70b376c1f..9f3669896 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomSamlAssertionValidator.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomSamlAssertionValidator.java @@ -21,7 +21,7 @@ package org.apache.wss4j.dom.common; 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.common.dom.RequestData; import org.apache.wss4j.common.dom.validate.Credential; import org.apache.wss4j.dom.validate.SamlAssertionValidator; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java index 2cfb43933..698b95f44 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java @@ -23,10 +23,10 @@ import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.common.bsp.BSPRule; import org.apache.wss4j.common.crypto.CertificateStore; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java index 4a7c275ee..9439a5c79 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java @@ -27,7 +27,7 @@ import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomCrypto; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/WSSConfigTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/WSSConfigTest.java index d46c5f739..6df42df85 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/WSSConfigTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/WSSConfigTest.java @@ -22,7 +22,7 @@ package org.apache.wss4j.dom.components.crypto; import java.security.Security; import org.apache.wss4j.common.crypto.WSProviderConfig; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java index 33d37a9e1..acbbf229b 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java @@ -26,7 +26,8 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.junit.jupiter.api.Test; import org.apache.wss4j.common.util.XMLUtils; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java index c5377d348..53c084c6a 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java @@ -24,8 +24,8 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomAction; import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.CustomProcessor; - -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.crypto.Crypto; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java index 1cb0ab66e..678ce2375 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java @@ -33,8 +33,8 @@ import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomHandler; - -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.message.WSSecTimestamp; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java index 46f7f0661..7e34e8dcf 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java @@ -42,8 +42,8 @@ import org.apache.wss4j.dom.common.CombinedCallbackHandler; import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SecretKeyCallbackHandler; - -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.xml.security.stax.impl.util.IDGenerator; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java index 959659b9c..21b2e6715 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java @@ -36,6 +36,7 @@ import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SAML2CallbackHandler; import org.apache.wss4j.dom.engine.WSSecurityEngine; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; import org.apache.wss4j.common.dom.message.token.SignatureConfirmation; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java index 6d6dc899f..84fdcfdc5 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java @@ -30,8 +30,8 @@ import javax.security.auth.callback.UnsupportedCallbackException; import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomHandler; - -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.junit.jupiter.api.Test; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java index e0e9a1824..5be84850d 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java @@ -29,8 +29,8 @@ import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; - -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.junit.jupiter.api.Test; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java index d747d1ec9..83661e5ef 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java @@ -26,7 +26,8 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.RequestData; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.junit.jupiter.api.Test; import org.apache.wss4j.common.util.XMLUtils; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java index e92b743da..590f6264f 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java @@ -52,9 +52,9 @@ import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +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.WSHandlerResult; import org.junit.jupiter.api.Test; import org.w3c.dom.Document; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java index 1647efbe1..9fe1008f4 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java @@ -22,7 +22,7 @@ package org.apache.wss4j.dom.message; import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.junit.jupiter.api.Test; import org.apache.wss4j.common.crypto.CryptoFactory; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java index 83e2163c4..d95bf2879 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java @@ -38,10 +38,10 @@ import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SecretKeyCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; 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.handler.WSHandlerResult; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java index c8aa536df..4a37e3862 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java @@ -23,7 +23,7 @@ import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java index 98579b9c4..2a2afa5a2 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java @@ -27,7 +27,7 @@ import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java index 46e039c09..aa8354c97 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java @@ -34,9 +34,9 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SecretKeyCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +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.WSHandlerResult; import org.apache.wss4j.dom.util.WSSecurityUtil; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java index 5da4f3ccc..67b5a8f17 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java @@ -29,7 +29,7 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.EncryptionActionToken; import org.apache.wss4j.common.crypto.Crypto; @@ -37,7 +37,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.XMLUtils; 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.junit.jupiter.api.BeforeEach; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java index 4b6f75d20..b04fc1949 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java @@ -29,7 +29,7 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.WSDataRef; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; @@ -38,7 +38,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.util.DOM2Writer; import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.common.util.XMLUtils; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.junit.jupiter.api.BeforeEach; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java index 34b6e641d..fb328fe68 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java @@ -25,7 +25,7 @@ import org.apache.wss4j.common.WSDataRef; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java index e47074eef..b28b26783 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java @@ -44,12 +44,12 @@ import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SecretKeyCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; 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.handler.WSHandlerResult; import org.apache.wss4j.dom.str.STRParser.REFERENCE_TYPE; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java index 91558b805..a146a3f0e 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java @@ -43,7 +43,7 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SAML1CallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java index 16931792a..578e55449 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java @@ -22,7 +22,7 @@ package org.apache.wss4j.dom.message; import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.junit.jupiter.api.Test; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java index 56a844fc5..e417be451 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java @@ -39,10 +39,10 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; 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.handler.WSHandlerResult; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java index 86eae1735..1a4e9040d 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java @@ -31,7 +31,7 @@ import org.apache.wss4j.common.dom.message.WSSecHeader; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.XMLUtils; 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.junit.jupiter.api.Test; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java index 6d43b9de5..419614767 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java @@ -31,7 +31,7 @@ import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SAML2CallbackHandler; import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.cache.MemoryReplayCache; @@ -46,7 +46,7 @@ import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.saml.bean.ConditionsBean; import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.apache.wss4j.common.util.XMLUtils; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.dom.validate.SamlAssertionValidator; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java index 79488d594..d857e07ff 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java @@ -33,7 +33,7 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; @@ -41,7 +41,7 @@ import org.apache.wss4j.common.dom.message.WSSecHeader; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.common.util.XMLUtils; -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.util.WSSecurityUtil; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java index 21ba6c146..e3a23fc0f 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java @@ -22,7 +22,7 @@ package org.apache.wss4j.dom.message; import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java index 954def2e8..8e464bb2a 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java @@ -25,7 +25,7 @@ import org.apache.wss4j.dom.WSConstants; import org.junit.jupiter.api.Test; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.crypto.Crypto; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java index 7734842d6..dd6d8f787 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java @@ -31,7 +31,7 @@ import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java index 4cba0f33e..29f8676aa 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java @@ -39,9 +39,9 @@ import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.SecretKeyCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +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.WSHandlerResult; import org.apache.wss4j.dom.util.WSSecurityUtil; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java index 27d206046..b25795429 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java @@ -24,7 +24,7 @@ import java.security.cert.X509Certificate; import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; @@ -32,7 +32,7 @@ import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.XMLUtils; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.util.WSSecurityUtil; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java index 66b21870f..84f4b4782 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java @@ -25,14 +25,14 @@ import java.util.regex.Pattern; import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.dom.message.WSSecHeader; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.XMLUtils; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.util.WSSecurityUtil; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java index 41bd128c6..54e721055 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java @@ -23,7 +23,7 @@ import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; @@ -33,7 +33,7 @@ import org.apache.wss4j.common.crypto.Merlin; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.XMLUtils; 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.handler.WSHandlerResult; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java index 639c7a83a..df896c04a 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java @@ -25,12 +25,12 @@ import org.apache.wss4j.common.WSDataRef; import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; 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.handler.WSHandlerResult; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureIssuerCertConstraintsTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureIssuerCertConstraintsTest.java index 88ca81eba..0a67346e2 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureIssuerCertConstraintsTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureIssuerCertConstraintsTest.java @@ -30,9 +30,9 @@ import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +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.WSHandlerResult; import org.apache.wss4j.dom.util.WSSecurityUtil; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java index 7eb66009f..f30f43464 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java @@ -31,11 +31,11 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.junit.jupiter.api.Test; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java index 2b52a6ae0..92f44c8c5 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java @@ -29,12 +29,12 @@ import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SAML1CallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; 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.handler.WSHandlerResult; import org.apache.wss4j.common.crypto.Crypto; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePrefixListTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePrefixListTest.java index 52cdd9f9d..b8b669384 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePrefixListTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePrefixListTest.java @@ -39,7 +39,7 @@ import org.apache.wss4j.common.util.Loader; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureProviderTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureProviderTest.java index f78c15fb6..7d9025d00 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureProviderTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureProviderTest.java @@ -29,11 +29,11 @@ import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.str.STRParser.REFERENCE_TYPE; import org.apache.wss4j.dom.util.WSSecurityUtil; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java index e0da72743..314476985 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java @@ -49,12 +49,12 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; 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.handler.WSHandlerResult; import org.apache.wss4j.dom.str.STRParser.REFERENCE_TYPE; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java index 578a0abf0..c1d38afc0 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java @@ -29,7 +29,7 @@ import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.dom.handler.WSHandlerResult; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java index cd262b9c6..86d772f16 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java @@ -34,10 +34,10 @@ import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; 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.handler.WSHandlerResult; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java index 9dbcf87aa..98abad5dd 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java @@ -35,7 +35,7 @@ import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SecretKeyCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; @@ -44,7 +44,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.common.util.XMLUtils; 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.junit.jupiter.api.BeforeEach; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java index d60d1c797..2023aafd8 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java @@ -36,11 +36,11 @@ import org.apache.wss4j.common.util.WSTimeSource; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.common.dom.message.token.Timestamp; import org.apache.wss4j.dom.validate.NoOpValidator; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java index 5b385b89e..a30c356c2 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java @@ -37,11 +37,11 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.EncodedPasswordCallbackHandler; import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.common.dom.message.token.UsernameToken; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java index b0445ba73..11b36a17b 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java @@ -24,7 +24,7 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; @@ -34,7 +34,7 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.UsernameTokenUtil; import org.apache.wss4j.common.util.XMLUtils; 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.handler.WSHandlerResult; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java index 2b2578ec2..9d9b83632 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java @@ -45,7 +45,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.message.WSSecHeader; 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.handler.WSHandlerResult; import org.apache.wss4j.common.dom.message.token.UsernameToken; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java index 0a403211f..99aeb66c3 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java @@ -46,10 +46,10 @@ import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; 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.handler.WSHandlerResult; import org.apache.wss4j.dom.util.WSSecurityUtil; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java index 081cae96a..296ed9705 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java @@ -23,7 +23,7 @@ import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.WSEncryptionPart; @@ -33,14 +33,14 @@ 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.common.util.XMLUtils; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.message.WSSecEncrypt; import org.apache.wss4j.dom.message.WSSecSignature; import org.apache.wss4j.common.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecTimestamp; import org.apache.wss4j.common.dom.validate.Credential; -import org.apache.wss4j.dom.validate.Validator; +import org.apache.wss4j.common.dom.validate.Validator; import org.junit.jupiter.api.Test; import org.w3c.dom.Document; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java index c9496f696..f3494dd3f 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java @@ -22,7 +22,7 @@ package org.apache.wss4j.dom.message.token; import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerResult; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java index 508aa05c7..083ba3ffe 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java @@ -22,7 +22,7 @@ package org.apache.wss4j.dom.message.token; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.token.Reference; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.junit.jupiter.api.Test; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java index aa3557ec3..44816e4e6 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java @@ -30,7 +30,7 @@ import org.apache.wss4j.common.util.DOM2Writer; import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.junit.jupiter.api.Test; import org.w3c.dom.Document; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java index 7dd730b08..b2d78ba3a 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java @@ -31,9 +31,9 @@ import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +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.WSHandlerResult; import org.junit.jupiter.api.Test; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java index 6d8154e18..edd624553 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java @@ -38,7 +38,7 @@ import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.dom.message.WSSecEncrypt; import org.apache.wss4j.common.dom.message.WSSecHeader; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java index de93d6e74..038cb7e69 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java @@ -44,16 +44,16 @@ import org.apache.wss4j.dom.common.SAML1CallbackHandler; import org.apache.wss4j.dom.common.SAML2CallbackHandler; import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.common.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSAMLToken; import org.apache.wss4j.dom.message.WSSecUsernameToken; import org.apache.wss4j.common.dom.validate.Credential; -import org.apache.wss4j.dom.validate.Validator; +import org.apache.wss4j.common.dom.validate.Validator; import org.junit.jupiter.api.Test; import org.w3c.dom.Document; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java index 51ff1f70f..c5ec8f89a 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java @@ -30,7 +30,7 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.WSDataRef; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerResult; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/RecipientKeyInfoTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/RecipientKeyInfoTest.java index 1c7bd6f2a..c7c8b8c66 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/RecipientKeyInfoTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/RecipientKeyInfoTest.java @@ -24,10 +24,10 @@ import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.junit.jupiter.api.Test; import org.w3c.dom.Document; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java index 730149a03..147bb40b8 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java @@ -30,7 +30,7 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.common.WSDataRef; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerResult; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java index 12ea4db99..d8d8aa3b4 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java @@ -31,9 +31,9 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.SAML1CallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +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.WSHandlerResult; import org.apache.wss4j.common.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSAMLToken; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java index 535b4eb23..9da888fb8 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java @@ -35,9 +35,9 @@ import org.apache.wss4j.dom.common.CustomSamlAssertionValidator; import org.apache.wss4j.dom.common.SAML1CallbackHandler; import org.apache.wss4j.dom.common.SAML2CallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +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.WSHandlerResult; import org.apache.wss4j.common.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSAMLToken; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java index 20af2c724..a427c3afe 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java @@ -44,9 +44,9 @@ import org.apache.wss4j.dom.common.CustomSamlAssertionValidator; import org.apache.wss4j.dom.common.SAML1CallbackHandler; import org.apache.wss4j.dom.common.SAML2CallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +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.WSHandlerResult; import org.apache.wss4j.common.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSAMLToken; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java index 7f575e764..e158b0dcc 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java @@ -27,9 +27,9 @@ import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SAML1CallbackHandler; import org.apache.wss4j.dom.common.SAML2CallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +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.WSHandlerResult; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java index 35050e7b7..b7ac40744 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java @@ -28,10 +28,10 @@ import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SAML1CallbackHandler; import org.apache.wss4j.dom.common.SAML2CallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java index f9cbd29d5..d2a10d126 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java @@ -39,11 +39,11 @@ import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SAML1CallbackHandler; import org.apache.wss4j.dom.common.SAML2CallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; 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.handler.WSHandlerResult; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java index d5c1c916e..cf543d401 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java @@ -38,10 +38,10 @@ import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SAML1CallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; 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.handler.WSHandlerResult; import org.apache.wss4j.common.dom.message.WSSecHeader; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java index 9e347584e..8ed998016 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java @@ -41,10 +41,10 @@ import org.apache.wss4j.common.WSDataRef; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SAML1CallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.message.WSSecDKSign; import org.apache.wss4j.common.dom.message.WSSecHeader; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java index b949d9f55..33ab3180b 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java @@ -26,10 +26,10 @@ import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SAML1CallbackHandler; import org.apache.wss4j.dom.common.SAML2CallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java index 2d335a153..ccc323654 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java @@ -28,7 +28,7 @@ import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SAML1CallbackHandler; import org.apache.wss4j.dom.common.SAML2CallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.crypto.Crypto; @@ -38,7 +38,7 @@ import org.apache.wss4j.common.saml.SAMLUtil; import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.apache.wss4j.common.util.XMLUtils; -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.common.dom.message.WSSecHeader; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java index 2c5f19f7a..811e405f5 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java @@ -59,11 +59,11 @@ import org.apache.wss4j.dom.common.SAML1CallbackHandler; import org.apache.wss4j.dom.common.SAML2CallbackHandler; import org.apache.wss4j.dom.common.SAMLElementCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; 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.handler.WSHandlerResult; import org.apache.wss4j.common.dom.message.WSSecHeader; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java index cb930c954..162064364 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java @@ -27,10 +27,10 @@ import org.apache.wss4j.dom.common.KeystoreCallbackHandler; import org.apache.wss4j.dom.common.SAML1CallbackHandler; import org.apache.wss4j.dom.common.SAML2CallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.common.bsp.BSPRule; import org.apache.wss4j.common.crypto.Crypto; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java index 15d4d7e63..54581df18 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java @@ -36,7 +36,7 @@ import org.apache.wss4j.common.util.DOM2Writer; import org.apache.wss4j.common.util.Loader; import org.apache.wss4j.dom.common.SAML2CallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.junit.jupiter.api.Test; import org.opensaml.xmlsec.signature.Signature; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/util/WSSecurityUtilTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/util/WSSecurityUtilTest.java index 5005dec8f..889041123 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/util/WSSecurityUtilTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/util/WSSecurityUtilTest.java @@ -23,7 +23,7 @@ import java.util.List; import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.handler.HandlerAction; import org.junit.jupiter.api.Test; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java index 59a8ef229..ae2806ee2 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java @@ -42,13 +42,14 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.SAML1CallbackHandler; import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.common.dom.message.WSSecHeader; import org.apache.wss4j.common.dom.validate.Credential; +import org.apache.wss4j.common.dom.validate.Validator; import org.apache.wss4j.dom.message.WSSecSignature; import org.apache.wss4j.dom.message.WSSecTimestamp; import org.apache.wss4j.dom.message.WSSecUsernameToken; diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java index 2f6e6b1f6..7e8a43387 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java @@ -56,10 +56,10 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; 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.WSHandler; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java index 77457102e..0865b8742 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java @@ -42,7 +42,7 @@ import org.apache.wss4j.common.token.SecurityTokenReference; import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.message.WSSecDKEncrypt; import org.apache.wss4j.dom.message.WSSecDKSign; diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java index 67e5a1614..cecc3286b 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java @@ -40,7 +40,7 @@ import org.apache.wss4j.common.derivedKey.ConversationConstants; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.message.WSSecDKEncrypt; import org.apache.wss4j.dom.message.WSSecDKSign; diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java index 04347c762..119076335 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java @@ -33,7 +33,7 @@ import javax.xml.transform.stream.StreamResult; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -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.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java index 252be73e6..2e186bba9 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java @@ -35,7 +35,7 @@ import javax.xml.transform.stream.StreamResult; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -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.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureIssuerCertConstaintsTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureIssuerCertConstaintsTest.java index b082fce5f..486bf44f6 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureIssuerCertConstaintsTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureIssuerCertConstaintsTest.java @@ -35,7 +35,7 @@ import javax.xml.transform.stream.StreamResult; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.common.KeystoreCallbackHandler; -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.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java index 1d9ac4a4b..b3e56b044 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java @@ -38,7 +38,7 @@ import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.token.SecurityTokenReference; import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.common.dom.engine.WSSConfig; import org.apache.wss4j.dom.message.WSSecDKSign; import org.apache.wss4j.common.dom.message.WSSecHeader; import org.apache.wss4j.dom.util.WSSecurityUtil;
