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 6c354bd46fba96efe4eee02fcdec46adc8139c3e Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Tue Jul 8 09:35:13 2025 +0100 Moving some tokens into the API module --- .../main/java/org/apache/wss4j/api/dom}/EncryptionActionToken.java | 2 +- .../src/main/java/org/apache/wss4j/api/dom/RequestData.java | 2 -- .../main/java/org/apache/wss4j/api/dom}/SecurityActionToken.java | 2 +- .../main/java/org/apache/wss4j/api/dom}/SignatureActionToken.java | 2 +- .../org/apache/wss4j/api/dom}/SignatureEncryptionActionToken.java | 3 ++- .../src/main/java/org/apache/wss4j/api/dom/action/Action.java | 2 +- .../java/org/apache/wss4j/dom/action/AbstractDerivedAction.java | 2 +- .../main/java/org/apache/wss4j/dom/action/CustomTokenAction.java | 2 +- .../src/main/java/org/apache/wss4j/dom/action/EncryptionAction.java | 4 ++-- .../java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java | 6 +++--- .../src/main/java/org/apache/wss4j/dom/action/SignatureAction.java | 4 ++-- .../org/apache/wss4j/dom/action/SignatureConfirmationAction.java | 4 ++-- .../java/org/apache/wss4j/dom/action/SignatureDerivedAction.java | 6 +++--- .../src/main/java/org/apache/wss4j/dom/action/TimestampAction.java | 2 +- .../main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java | 2 +- .../java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java | 4 ++-- .../src/main/java/org/apache/wss4j/dom/handler/HandlerAction.java | 2 +- .../src/main/java/org/apache/wss4j/dom/handler/WSHandler.java | 6 +++--- .../src/test/java/org/apache/wss4j/dom/common/CustomAction.java | 2 +- .../java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java | 4 ++-- .../test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java | 2 +- .../org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java | 2 +- .../org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java | 4 ++-- .../apache/wss4j/common/saml/action/SAMLTokenUnsignedAction.java | 2 +- .../org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java | 2 +- 25 files changed, 37 insertions(+), 38 deletions(-) diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/EncryptionActionToken.java b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/EncryptionActionToken.java similarity index 99% rename from ws-security-common/src/main/java/org/apache/wss4j/common/EncryptionActionToken.java rename to ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/EncryptionActionToken.java index cf6672643..65a639893 100644 --- a/ws-security-common/src/main/java/org/apache/wss4j/common/EncryptionActionToken.java +++ b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/EncryptionActionToken.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.wss4j.common; +package org.apache.wss4j.api.dom; import org.apache.xml.security.encryption.params.KeyDerivationParameters; diff --git a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/RequestData.java b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/RequestData.java index f39ab5254..15c77015a 100644 --- a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/RequestData.java +++ b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/RequestData.java @@ -33,8 +33,6 @@ import javax.security.auth.callback.CallbackHandler; import javax.xml.namespace.QName; import org.apache.wss4j.common.ConfigurationConstants; -import org.apache.wss4j.common.EncryptionActionToken; -import org.apache.wss4j.common.SignatureActionToken; import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.bsp.BSPEnforcer; import org.apache.wss4j.common.bsp.BSPRule; diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/SecurityActionToken.java b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SecurityActionToken.java similarity index 97% rename from ws-security-common/src/main/java/org/apache/wss4j/common/SecurityActionToken.java rename to ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SecurityActionToken.java index 91f28f73f..54888a327 100644 --- a/ws-security-common/src/main/java/org/apache/wss4j/common/SecurityActionToken.java +++ b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SecurityActionToken.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.wss4j.common; +package org.apache.wss4j.api.dom; import java.security.cert.X509Certificate; diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/SignatureActionToken.java b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SignatureActionToken.java similarity index 97% rename from ws-security-common/src/main/java/org/apache/wss4j/common/SignatureActionToken.java rename to ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SignatureActionToken.java index b6dd81301..d7d1afbea 100644 --- a/ws-security-common/src/main/java/org/apache/wss4j/common/SignatureActionToken.java +++ b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SignatureActionToken.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.wss4j.common; +package org.apache.wss4j.api.dom; /** diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/SignatureEncryptionActionToken.java b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SignatureEncryptionActionToken.java similarity index 98% rename from ws-security-common/src/main/java/org/apache/wss4j/common/SignatureEncryptionActionToken.java rename to ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SignatureEncryptionActionToken.java index c65451aef..ca1d611c0 100644 --- a/ws-security-common/src/main/java/org/apache/wss4j/common/SignatureEncryptionActionToken.java +++ b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/SignatureEncryptionActionToken.java @@ -16,13 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.wss4j.common; +package org.apache.wss4j.api.dom; import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.List; import java.util.Properties; +import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; diff --git a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/Action.java b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/Action.java index d87daa53d..51caeb067 100644 --- a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/Action.java +++ b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/action/Action.java @@ -19,7 +19,7 @@ package org.apache.wss4j.api.dom.action; -import org.apache.wss4j.common.SecurityActionToken; +import org.apache.wss4j.api.dom.SecurityActionToken; import org.apache.wss4j.api.dom.RequestData; import org.apache.wss4j.common.ext.WSSecurityException; 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 f23d70bcf..24747dfff 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 @@ -25,7 +25,7 @@ import org.w3c.dom.Node; import javax.crypto.SecretKey; -import org.apache.wss4j.common.SignatureEncryptionActionToken; +import org.apache.wss4j.api.dom.SignatureEncryptionActionToken; import org.apache.wss4j.common.derivedKey.ConversationConstants; import org.apache.wss4j.api.dom.message.WSSecHeader; import org.apache.wss4j.common.ext.WSPasswordCallback; 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 a81d627a7..a69312a7c 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 @@ -19,7 +19,7 @@ package org.apache.wss4j.dom.action; -import org.apache.wss4j.common.SecurityActionToken; +import org.apache.wss4j.api.dom.SecurityActionToken; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.api.dom.WSConstants; 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 446898bea..88ab5bdbd 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 @@ -26,8 +26,8 @@ import javax.crypto.SecretKey; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; -import org.apache.wss4j.common.EncryptionActionToken; -import org.apache.wss4j.common.SecurityActionToken; +import org.apache.wss4j.api.dom.EncryptionActionToken; +import org.apache.wss4j.api.dom.SecurityActionToken; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoType; import org.apache.wss4j.common.ext.WSPasswordCallback; 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 369915f0e..e0df9d022 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 @@ -25,9 +25,9 @@ import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; import javax.security.auth.callback.CallbackHandler; -import org.apache.wss4j.common.EncryptionActionToken; -import org.apache.wss4j.common.SecurityActionToken; -import org.apache.wss4j.common.SignatureActionToken; +import org.apache.wss4j.api.dom.EncryptionActionToken; +import org.apache.wss4j.api.dom.SecurityActionToken; +import org.apache.wss4j.api.dom.SignatureActionToken; import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.derivedKey.ConversationConstants; import org.apache.wss4j.common.ext.WSPasswordCallback; 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 64e104e85..fa7c842d0 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 @@ -24,8 +24,8 @@ import java.util.List; import javax.security.auth.callback.CallbackHandler; -import org.apache.wss4j.common.SecurityActionToken; -import org.apache.wss4j.common.SignatureActionToken; +import org.apache.wss4j.api.dom.SecurityActionToken; +import org.apache.wss4j.api.dom.SignatureActionToken; import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; 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 e557112f8..6fb1629bd 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 @@ -21,8 +21,8 @@ package org.apache.wss4j.dom.action; import org.apache.wss4j.api.dom.WSConstants; import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.common.SecurityActionToken; -import org.apache.wss4j.common.SignatureActionToken; +import org.apache.wss4j.api.dom.SecurityActionToken; +import org.apache.wss4j.api.dom.SignatureActionToken; import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.api.dom.RequestData; 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 3894253f1..3034e440d 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 @@ -25,9 +25,9 @@ import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; import javax.security.auth.callback.CallbackHandler; -import org.apache.wss4j.common.EncryptionActionToken; -import org.apache.wss4j.common.SecurityActionToken; -import org.apache.wss4j.common.SignatureActionToken; +import org.apache.wss4j.api.dom.EncryptionActionToken; +import org.apache.wss4j.api.dom.SecurityActionToken; +import org.apache.wss4j.api.dom.SignatureActionToken; import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.derivedKey.ConversationConstants; 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 65ccd80b4..fbb10df14 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 @@ -19,7 +19,7 @@ package org.apache.wss4j.dom.action; -import org.apache.wss4j.common.SecurityActionToken; +import org.apache.wss4j.api.dom.SecurityActionToken; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.api.dom.WSConstants; import org.apache.wss4j.api.dom.RequestData; 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 5b37d2582..7a3c52311 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 @@ -21,7 +21,7 @@ package org.apache.wss4j.dom.action; import javax.security.auth.callback.CallbackHandler; -import org.apache.wss4j.common.SecurityActionToken; +import org.apache.wss4j.api.dom.SecurityActionToken; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.api.dom.WSConstants; 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 5de044086..21069b914 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 @@ -26,8 +26,8 @@ import java.util.List; import javax.security.auth.callback.CallbackHandler; import org.apache.wss4j.api.dom.WSConstants; -import org.apache.wss4j.common.SecurityActionToken; -import org.apache.wss4j.common.SignatureActionToken; +import org.apache.wss4j.api.dom.SecurityActionToken; +import org.apache.wss4j.api.dom.SignatureActionToken; import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/HandlerAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/HandlerAction.java index 86ca0cdfc..bfb2c2ad6 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/HandlerAction.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/HandlerAction.java @@ -19,7 +19,7 @@ package org.apache.wss4j.dom.handler; -import org.apache.wss4j.common.SecurityActionToken; +import org.apache.wss4j.api.dom.SecurityActionToken; /** 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 a46398721..354e1f28f 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 @@ -33,9 +33,9 @@ import org.apache.wss4j.api.dom.SOAPConstants; import org.apache.wss4j.api.dom.WSDocInfo; import org.apache.wss4j.api.dom.engine.WSSConfig; import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult; -import org.apache.wss4j.common.EncryptionActionToken; -import org.apache.wss4j.common.SignatureActionToken; -import org.apache.wss4j.common.SignatureEncryptionActionToken; +import org.apache.wss4j.api.dom.EncryptionActionToken; +import org.apache.wss4j.api.dom.SignatureActionToken; +import org.apache.wss4j.api.dom.SignatureEncryptionActionToken; import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.crypto.AlgorithmSuite; import org.apache.wss4j.common.crypto.Crypto; 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 b4c3ae9b6..b9674c204 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 @@ -23,7 +23,7 @@ import org.apache.wss4j.api.dom.action.Action; import java.util.Map; -import org.apache.wss4j.common.SecurityActionToken; +import org.apache.wss4j.api.dom.SecurityActionToken; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.api.dom.RequestData; 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 c7eddff50..ba56c2ce2 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 @@ -28,8 +28,8 @@ import javax.crypto.SecretKey; import javax.security.auth.callback.CallbackHandler; import javax.xml.crypto.dsig.SignatureMethod; -import org.apache.wss4j.common.EncryptionActionToken; -import org.apache.wss4j.common.SignatureActionToken; +import org.apache.wss4j.api.dom.EncryptionActionToken; +import org.apache.wss4j.api.dom.SignatureActionToken; import org.apache.wss4j.common.WSEncryptionPart; 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/message/EncryptionCRLTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java index 2ea5b4631..eacf63f52 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 @@ -31,7 +31,7 @@ import org.apache.wss4j.common.crypto.KeystoreCallbackHandler; import org.apache.wss4j.api.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; -import org.apache.wss4j.common.EncryptionActionToken; +import org.apache.wss4j.api.dom.EncryptionActionToken; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; 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 d8c3f97e8..f3d15cb63 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 @@ -26,7 +26,7 @@ import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; import javax.xml.crypto.dsig.SignatureMethod; -import org.apache.wss4j.common.SignatureActionToken; +import org.apache.wss4j.api.dom.SignatureActionToken; import org.apache.wss4j.common.bsp.BSPRule; import org.apache.wss4j.common.crypto.AlgorithmSuite; import org.apache.wss4j.common.crypto.Crypto; diff --git a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java index 50d144337..9d4ff3d6f 100644 --- a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java +++ b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java @@ -21,8 +21,8 @@ package org.apache.wss4j.common.saml.action; import javax.security.auth.callback.CallbackHandler; -import org.apache.wss4j.common.SecurityActionToken; -import org.apache.wss4j.common.SignatureActionToken; +import org.apache.wss4j.api.dom.SecurityActionToken; +import org.apache.wss4j.api.dom.SignatureActionToken; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SamlAssertionWrapper; diff --git a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenUnsignedAction.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenUnsignedAction.java index 3d2d7662e..4e820e6ed 100644 --- a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenUnsignedAction.java +++ b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenUnsignedAction.java @@ -21,7 +21,7 @@ package org.apache.wss4j.common.saml.action; import javax.security.auth.callback.CallbackHandler; -import org.apache.wss4j.common.SecurityActionToken; +import org.apache.wss4j.api.dom.SecurityActionToken; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.saml.SAMLCallback; diff --git a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java index 2aa8eb9ab..b4cf814e6 100644 --- a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java +++ b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java @@ -30,7 +30,7 @@ import javax.xml.crypto.dsig.dom.DOMSignContext; import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec; import javax.xml.crypto.dsig.spec.ExcC14NParameterSpec; -import org.apache.wss4j.common.SignatureActionToken; +import org.apache.wss4j.api.dom.SignatureActionToken; import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoType;
