(ws-wss4j) branch coheigea/saml-refactor updated: Switching package names for SAML

[coheigea]

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch coheigea/saml-refactor
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git


The following commit(s) were added to refs/heads/coheigea/saml-refactor by this 
push:
     new 40247b6eb Switching package names for SAML
40247b6eb is described below

commit 40247b6eb01990ac27d7592bd9719e1de4816882
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Fri Nov 3 07:11:27 2023 +0000

    Switching package names for SAML
---
 pom.xml                                            |   1 +
 .../wss4j/dom/action/SAMLTokenSignedAction.java    |   6 +-
 .../wss4j/dom/action/SAMLTokenUnsignedAction.java  |   6 +-
 .../wss4j/dom/engine/WSSecurityEngineResult.java   |   2 +-
 .../apache/wss4j/dom/message/WSSecSAMLToken.java   |   2 +-
 .../processor/BinarySecurityTokenProcessor.java    |   2 +-
 .../wss4j/dom/processor/SAMLTokenProcessor.java    |   8 +-
 .../dom/processor/UsernameTokenProcessor.java      |   2 +-
 .../org/apache/wss4j/dom/saml/DOMSAMLUtil.java     |   6 +-
 .../wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java    |   4 +-
 .../apache/wss4j/dom/saml/WSSecSignatureSAML.java  |   8 +-
 .../wss4j/dom/str/DerivedKeyTokenSTRParser.java    |   6 +-
 .../wss4j/dom/str/EncryptedKeySTRParser.java       |   6 +-
 .../org/apache/wss4j/dom/str/STRParserUtil.java    |   2 +-
 .../wss4j/dom/str/SecurityTokenRefSTRParser.java   |   6 +-
 .../apache/wss4j/dom/str/SignatureSTRParser.java   |  10 +-
 .../org/apache/wss4j/dom/validate/Credential.java  |   2 +-
 .../wss4j/dom/validate/SamlAssertionValidator.java |  10 +-
 .../dom/common/AbstractSAMLCallbackHandler.java    |  26 +-
 .../dom/common/CustomSamlAssertionValidator.java   |   2 +-
 .../wss4j/dom/common/SAML1AuthnHOKHandler.java     |  12 +-
 .../wss4j/dom/common/SAML1CallbackHandler.java     |  12 +-
 .../wss4j/dom/common/SAML2CallbackHandler.java     |  12 +-
 .../dom/common/SAMLElementCallbackHandler.java     |   8 +-
 .../dom/handler/SignatureConfirmationTest.java     |   2 +-
 .../wss4j/dom/message/ModifiedRequestTest.java     |   8 +-
 .../org/apache/wss4j/dom/message/ReplayTest.java   |  10 +-
 .../wss4j/dom/message/SignaturePartsTest.java      |   8 +-
 .../org/apache/wss4j/dom/misc/PrincipalTest.java   |   8 +-
 .../wss4j/dom/saml/SamlAlgorithmSuiteTest.java     |   8 +-
 .../org/apache/wss4j/dom/saml/SamlAuthnTest.java   |   6 +-
 .../apache/wss4j/dom/saml/SamlConditionsTest.java  |  18 +-
 .../apache/wss4j/dom/saml/SamlNegativeTest.java    |  14 +-
 .../apache/wss4j/dom/saml/SamlReferenceTest.java   |  10 +-
 .../apache/wss4j/dom/saml/SamlTokenActionTest.java |   2 +-
 .../dom/saml/SamlTokenCustomSignatureTest.java     |   8 +-
 .../wss4j/dom/saml/SamlTokenDerivedTest.java       |   8 +-
 .../apache/wss4j/dom/saml/SamlTokenHOKTest.java    |  10 +-
 .../org/apache/wss4j/dom/saml/SamlTokenSVTest.java |  10 +-
 .../org/apache/wss4j/dom/saml/SamlTokenTest.java   |  14 +-
 .../wss4j/dom/saml/SignedSamlTokenHOKTest.java     |  12 +-
 .../wss4j/dom/saml/ext/AssertionSigningTest.java   |  10 +-
 .../apache/wss4j/dom/validate/ValidatorTest.java   |   6 +-
 .../assertionStates/IssuedTokenAssertionState.java |   2 +-
 .../assertionStates/SamlTokenAssertionState.java   |   2 +-
 .../policy/stax/test/AbstractPolicyTestBase.java   |   4 +-
 .../test/AsymmetricBindingIntegrationTest.java     |   4 +-
 .../wss4j/policy/stax/test/IssuedTokenTest.java    |  12 +-
 .../wss4j/policy/stax/test/SamlTokenTest.java      |   8 +-
 .../policy/stax/test/SupportingTokensTest.java     |   8 +-
 .../org/apache/wss4j/saml/OpenSAMLBootstrap.java   |   2 +-
 .../java/org/apache/wss4j/saml/OpenSAMLUtil.java   |   2 +-
 .../java/org/apache/wss4j/saml/SAMLCallback.java   |  16 +-
 .../java/org/apache/wss4j/saml/SAMLKeyInfo.java    |   2 +-
 .../apache/wss4j/saml/SAMLKeyInfoProcessor.java    |   2 +-
 .../main/java/org/apache/wss4j/saml/SAMLUtil.java  |   2 +-
 .../apache/wss4j/saml/SamlAssertionWrapper.java    |   6 +-
 .../saml/WSS4JXSBase64BinaryUnmarshaller.java      |   2 +-
 .../org/apache/wss4j/saml/bean/ActionBean.java     |   2 +-
 .../org/apache/wss4j/saml/bean/AdviceBean.java     |   2 +-
 .../org/apache/wss4j/saml/bean/AttributeBean.java  |   2 +-
 .../wss4j/saml/bean/AttributeStatementBean.java    |   2 +-
 .../wss4j/saml/bean/AudienceRestrictionBean.java   |   2 +-
 .../wss4j/saml/bean/AuthDecisionStatementBean.java |   2 +-
 .../saml/bean/AuthenticationStatementBean.java     |   2 +-
 .../org/apache/wss4j/saml/bean/ConditionsBean.java |   2 +-
 .../org/apache/wss4j/saml/bean/DelegateBean.java   |   2 +-
 .../org/apache/wss4j/saml/bean/KeyInfoBean.java    |   2 +-
 .../org/apache/wss4j/saml/bean/NameIDBean.java     |   2 +-
 .../wss4j/saml/bean/ProxyRestrictionBean.java      |   2 +-
 .../org/apache/wss4j/saml/bean/SubjectBean.java    |   2 +-
 .../saml/bean/SubjectConfirmationDataBean.java     |   2 +-
 .../wss4j/saml/bean/SubjectLocalityBean.java       |   2 +-
 .../java/org/apache/wss4j/saml/bean/Version.java   |   2 +-
 .../wss4j/saml/builder/SAML1ComponentBuilder.java  |  26 +-
 .../apache/wss4j/saml/builder/SAML1Constants.java  |   2 +-
 .../wss4j/saml/builder/SAML2ComponentBuilder.java  |  34 +--
 .../apache/wss4j/saml/builder/SAML2Constants.java  |   2 +-
 .../wss4j/saml/principal/SAMLTokenPrincipal.java   |   4 +-
 .../saml/principal/SAMLTokenPrincipalImpl.java     |   4 +-
 .../wss4j/saml/processor/SAMLTokenProcessor.java   | 285 ---------------------
 .../src/main/resources/wss4j-signature-config.xml  |   2 +-
 .../wss4j/{common => }/saml/OpenSAMLUtilTest.java  |   2 +-
 .../processor/input/SAMLTokenInputHandler.java     |   4 +-
 .../processor/output/SAMLTokenOutputProcessor.java |  12 +-
 .../impl/securityToken/SamlSecurityTokenImpl.java  |  10 +-
 .../stax/securityEvent/SamlTokenSecurityEvent.java |   4 +-
 .../stax/securityToken/SamlSecurityToken.java      |   2 +-
 .../wss4j/stax/validate/SamlTokenValidator.java    |   2 +-
 .../stax/validate/SamlTokenValidatorImpl.java      |   8 +-
 .../wss4j/stax/test/CallbackHandlerImpl.java       |   2 +-
 .../test/InboundWSSecurityContextImplTest.java     |   8 +-
 .../org/apache/wss4j/stax/test/PrincipalTest.java  |   1 +
 .../org/apache/wss4j/stax/test/ReplayTest.java     |   4 +-
 .../wss4j/stax/test/saml/CustomContentsTest.java   |  10 +-
 .../wss4j/stax/test/saml/SAML1CallbackHandler.java |   4 +-
 .../wss4j/stax/test/saml/SAML2CallbackHandler.java |   4 +-
 .../stax/test/saml/SAMLCallbackHandlerImpl.java    |  30 +--
 .../wss4j/stax/test/saml/SAMLTokenHOKTest.java     |  14 +-
 .../stax/test/saml/SAMLTokenNegativeTest.java      |   4 +-
 .../stax/test/saml/SAMLTokenReferenceTest.java     |  12 +-
 .../wss4j/stax/test/saml/SAMLTokenSVTest.java      |   6 +-
 .../apache/wss4j/stax/test/saml/SAMLTokenTest.java |  12 +-
 .../apache/wss4j/stax/test/saml/SamlAuthnTest.java |   4 +-
 .../wss4j/stax/test/saml/SamlConditionsTest.java   |   8 +-
 .../wss4j/stax/test/saml/SamlTokenDerivedTest.java |   8 +-
 106 files changed, 345 insertions(+), 628 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9aaf5d506..9de28310d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,6 +117,7 @@
         <module>bindings</module>
         <module>policy</module>
         <module>ws-security-common</module>
+        <module>ws-security-saml</module>
         <module>ws-security-dom</module>
         <module>ws-security-stax</module>
         <module>ws-security-web</module>
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 edf8493f1..f6406382e 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
@@ -26,9 +26,9 @@ import org.apache.wss4j.common.SignatureActionToken;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.ext.WSPasswordCallback;
 import org.apache.wss4j.common.ext.WSSecurityException;
-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.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.handler.WSHandler;
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 f7cc633f9..fc1422e60 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
@@ -23,9 +23,9 @@ import javax.security.auth.callback.CallbackHandler;
 
 import org.apache.wss4j.common.SecurityActionToken;
 import org.apache.wss4j.common.ext.WSSecurityException;
-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.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.handler.WSHandler;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngineResult.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngineResult.java
index 885f92610..5835be269 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngineResult.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngineResult.java
@@ -19,7 +19,7 @@
 
 package org.apache.wss4j.dom.engine;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.token.BinarySecurity;
 import org.apache.wss4j.dom.WSDataRef;
 import org.apache.wss4j.dom.message.token.SecurityContextToken;
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSAMLToken.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSAMLToken.java
index 404552738..4ae99a154 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSAMLToken.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSAMLToken.java
@@ -19,7 +19,7 @@
 
 package org.apache.wss4j.dom.message;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.dom.util.WSSecurityUtil;
 
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 b6dfb01ad..14aae8fa3 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
@@ -26,7 +26,6 @@ import javax.xml.namespace.QName;
 
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.principal.SAMLTokenPrincipalImpl;
 import org.apache.wss4j.common.token.BinarySecurity;
 import org.apache.wss4j.common.token.PKIPathSecurity;
 import org.apache.wss4j.common.token.X509Security;
@@ -38,6 +37,7 @@ import org.apache.wss4j.dom.message.token.KerberosSecurity;
 import org.apache.wss4j.dom.util.WSSecurityUtil;
 import org.apache.wss4j.dom.validate.Credential;
 import org.apache.wss4j.dom.validate.Validator;
+import org.apache.wss4j.saml.principal.SAMLTokenPrincipalImpl;
 import org.w3c.dom.Element;
 
 /**
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 491c655d9..626c76af7 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
@@ -38,10 +38,6 @@ import javax.xml.namespace.QName;
 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.common.principal.SAMLTokenPrincipalImpl;
-import org.apache.wss4j.common.saml.SAMLKeyInfo;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.DOM2Writer;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDataRef;
@@ -51,6 +47,10 @@ import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor;
 import org.apache.wss4j.dom.util.EncryptionUtils;
 import org.apache.wss4j.dom.validate.Credential;
 import org.apache.wss4j.dom.validate.Validator;
+import org.apache.wss4j.saml.SAMLKeyInfo;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.principal.SAMLTokenPrincipalImpl;
 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/UsernameTokenProcessor.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java
index ea3835f97..cccda5a38 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
@@ -22,12 +22,12 @@ package org.apache.wss4j.dom.processor;
 import java.time.Instant;
 import java.util.List;
 
-import org.apache.wss4j.common.principal.SAMLTokenPrincipalImpl;
 import org.apache.wss4j.common.principal.WSUsernameTokenPrincipalImpl;
 import org.apache.wss4j.common.util.UsernameTokenUtil;
 import org.w3c.dom.Element;
 import org.apache.wss4j.common.cache.ReplayCache;
 import org.apache.wss4j.common.ext.WSSecurityException;
+import org.apache.wss4j.saml.principal.SAMLTokenPrincipalImpl;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
 import org.apache.wss4j.dom.handler.RequestData;
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java
index 68be6eabd..63ff10270 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java
@@ -29,9 +29,9 @@ import java.util.List;
 
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.principal.WSDerivedKeyTokenPrincipal;
-import org.apache.wss4j.common.saml.OpenSAMLUtil;
-import org.apache.wss4j.common.saml.SAMLKeyInfo;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.OpenSAMLUtil;
+import org.apache.wss4j.saml.SAMLKeyInfo;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDataRef;
 import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
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 6e5013ffd..d0fa72cb7 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
@@ -31,8 +31,8 @@ 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.common.principal.WSDerivedKeyTokenPrincipal;
-import org.apache.wss4j.common.saml.SAMLKeyInfo;
-import org.apache.wss4j.common.saml.SAMLKeyInfoProcessor;
+import org.apache.wss4j.saml.SAMLKeyInfo;
+import org.apache.wss4j.saml.SAMLKeyInfoProcessor;
 import org.apache.wss4j.common.token.SecurityTokenReference;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
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 3ed8061e2..41b838dcd 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
@@ -35,10 +35,10 @@ import org.apache.wss4j.common.WSEncryptionPart;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.OpenSAMLUtil;
-import org.apache.wss4j.common.saml.SAMLKeyInfo;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.OpenSAMLUtil;
+import org.apache.wss4j.saml.SAMLKeyInfo;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.token.BinarySecurity;
 import org.apache.wss4j.common.token.DOMX509Data;
 import org.apache.wss4j.common.token.DOMX509IssuerSerial;
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 2893a8785..21cd0b5d3 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
@@ -26,9 +26,9 @@ import java.util.List;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.ext.WSPasswordCallback;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLKeyInfo;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SAMLKeyInfo;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.token.BinarySecurity;
 import org.apache.wss4j.common.token.SecurityTokenReference;
 import org.apache.wss4j.common.util.KeyUtils;
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 48f0d095e..58a370dab 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
@@ -25,9 +25,9 @@ import javax.xml.namespace.QName;
 
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLKeyInfo;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SAMLKeyInfo;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.token.BinarySecurity;
 import org.apache.wss4j.common.token.Reference;
 import org.apache.wss4j.common.token.SecurityTokenReference;
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 689c92ed0..c902f5231 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
@@ -28,7 +28,7 @@ import org.apache.wss4j.common.bsp.BSPEnforcer;
 import org.apache.wss4j.common.bsp.BSPRule;
 import org.apache.wss4j.common.ext.WSPasswordCallback;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.token.BinarySecurity;
 import org.apache.wss4j.common.token.PKIPathSecurity;
 import org.apache.wss4j.common.token.SecurityTokenReference;
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 a8d02ef9f..e24a795ac 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
@@ -26,9 +26,9 @@ import javax.xml.namespace.QName;
 
 import org.apache.wss4j.common.ext.WSPasswordCallback;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLKeyInfo;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SAMLKeyInfo;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.token.BinarySecurity;
 import org.apache.wss4j.common.token.Reference;
 import org.apache.wss4j.common.token.SecurityTokenReference;
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 478556fac..4551943f0 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
@@ -31,12 +31,12 @@ import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.ext.WSPasswordCallback;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.principal.CustomTokenPrincipal;
-import org.apache.wss4j.common.principal.SAMLTokenPrincipalImpl;
 import org.apache.wss4j.common.principal.WSDerivedKeyTokenPrincipal;
-import org.apache.wss4j.common.saml.OpenSAMLUtil;
-import org.apache.wss4j.common.saml.SAMLKeyInfo;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.OpenSAMLUtil;
+import org.apache.wss4j.saml.SAMLKeyInfo;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.principal.SAMLTokenPrincipalImpl;
 import org.apache.wss4j.common.token.BinarySecurity;
 import org.apache.wss4j.common.token.Reference;
 import org.apache.wss4j.common.token.SecurityTokenReference;
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/Credential.java 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/Credential.java
index dd911ac5a..645866fcc 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/Credential.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/Credential.java
@@ -25,7 +25,7 @@ import java.security.cert.X509Certificate;
 
 import javax.security.auth.Subject;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.token.BinarySecurity;
 import org.apache.wss4j.dom.message.token.SecurityContextToken;
 import org.apache.wss4j.dom.message.token.Timestamp;
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 9303cd36a..210538fbc 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
@@ -24,11 +24,11 @@ import java.util.List;
 
 import org.apache.wss4j.common.cache.ReplayCache;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.OpenSAMLUtil;
-import org.apache.wss4j.common.saml.SAMLKeyInfo;
-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.saml.OpenSAMLUtil;
+import org.apache.wss4j.saml.SAMLKeyInfo;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.opensaml.saml.common.SAMLVersion;
 
diff --git 
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/AbstractSAMLCallbackHandler.java
 
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/AbstractSAMLCallbackHandler.java
index 3bdd0bc2a..5f84bceaf 100644
--- 
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/AbstractSAMLCallbackHandler.java
+++ 
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/AbstractSAMLCallbackHandler.java
@@ -21,20 +21,20 @@ package org.apache.wss4j.dom.common;
 
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.common.crypto.Crypto;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.bean.ActionBean;
-import org.apache.wss4j.common.saml.bean.AttributeBean;
-import org.apache.wss4j.common.saml.bean.AttributeStatementBean;
-import org.apache.wss4j.common.saml.bean.AuthDecisionStatementBean;
-import org.apache.wss4j.common.saml.bean.AuthenticationStatementBean;
-import org.apache.wss4j.common.saml.bean.ConditionsBean;
-import org.apache.wss4j.common.saml.bean.KeyInfoBean;
-import org.apache.wss4j.common.saml.bean.KeyInfoBean.CERT_IDENTIFIER;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.bean.ActionBean;
+import org.apache.wss4j.saml.bean.AttributeBean;
+import org.apache.wss4j.saml.bean.AttributeStatementBean;
+import org.apache.wss4j.saml.bean.AuthDecisionStatementBean;
+import org.apache.wss4j.saml.bean.AuthenticationStatementBean;
+import org.apache.wss4j.saml.bean.ConditionsBean;
+import org.apache.wss4j.saml.bean.KeyInfoBean;
+import org.apache.wss4j.saml.bean.KeyInfoBean.CERT_IDENTIFIER;
 import org.apache.wss4j.common.util.KeyUtils;
-import org.apache.wss4j.common.saml.bean.NameIDBean;
-import org.apache.wss4j.common.saml.bean.SubjectBean;
-import org.apache.wss4j.common.saml.bean.SubjectConfirmationDataBean;
-import org.apache.wss4j.common.saml.bean.SubjectLocalityBean;
+import org.apache.wss4j.saml.bean.NameIDBean;
+import org.apache.wss4j.saml.bean.SubjectBean;
+import org.apache.wss4j.saml.bean.SubjectConfirmationDataBean;
+import org.apache.wss4j.saml.bean.SubjectLocalityBean;
 import org.apache.wss4j.dom.message.WSSecEncryptedKey;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
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 c2920c7e2..417a8b99f 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
@@ -20,7 +20,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.saml.SamlAssertionWrapper;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.validate.Credential;
 import org.apache.wss4j.dom.validate.SamlAssertionValidator;
diff --git 
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAML1AuthnHOKHandler.java
 
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAML1AuthnHOKHandler.java
index 8762377e0..1bd1fc3c6 100644
--- 
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAML1AuthnHOKHandler.java
+++ 
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAML1AuthnHOKHandler.java
@@ -23,12 +23,12 @@ import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.bean.AuthenticationStatementBean;
-import org.apache.wss4j.common.saml.bean.KeyInfoBean;
-import org.apache.wss4j.common.saml.bean.SubjectBean;
-import org.apache.wss4j.common.saml.bean.Version;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.bean.AuthenticationStatementBean;
+import org.apache.wss4j.saml.bean.KeyInfoBean;
+import org.apache.wss4j.saml.bean.SubjectBean;
+import org.apache.wss4j.saml.bean.Version;
+import org.apache.wss4j.saml.builder.SAML1Constants;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
diff --git 
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAML1CallbackHandler.java
 
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAML1CallbackHandler.java
index 03daec925..9331d8b46 100644
--- 
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAML1CallbackHandler.java
+++ 
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAML1CallbackHandler.java
@@ -22,12 +22,12 @@ package org.apache.wss4j.dom.common;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.bean.AdviceBean;
-import org.apache.wss4j.common.saml.bean.KeyInfoBean;
-import org.apache.wss4j.common.saml.bean.SubjectBean;
-import org.apache.wss4j.common.saml.bean.Version;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.bean.AdviceBean;
+import org.apache.wss4j.saml.bean.KeyInfoBean;
+import org.apache.wss4j.saml.bean.SubjectBean;
+import org.apache.wss4j.saml.bean.Version;
+import org.apache.wss4j.saml.builder.SAML1Constants;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.UnsupportedCallbackException;
diff --git 
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAML2CallbackHandler.java
 
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAML2CallbackHandler.java
index b3bb8741b..8ed8c0937 100644
--- 
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAML2CallbackHandler.java
+++ 
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAML2CallbackHandler.java
@@ -22,12 +22,12 @@ package org.apache.wss4j.dom.common;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.bean.AdviceBean;
-import org.apache.wss4j.common.saml.bean.KeyInfoBean;
-import org.apache.wss4j.common.saml.bean.SubjectBean;
-import org.apache.wss4j.common.saml.bean.Version;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.bean.AdviceBean;
+import org.apache.wss4j.saml.bean.KeyInfoBean;
+import org.apache.wss4j.saml.bean.SubjectBean;
+import org.apache.wss4j.saml.bean.Version;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.UnsupportedCallbackException;
diff --git 
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAMLElementCallbackHandler.java
 
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAMLElementCallbackHandler.java
index 3ff1e92a2..fa3e56a82 100644
--- 
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAMLElementCallbackHandler.java
+++ 
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SAMLElementCallbackHandler.java
@@ -25,10 +25,10 @@ import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-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.common.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.builder.SAML1Constants;
 import org.w3c.dom.Element;
 
 /**
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 36704d6c2..09b7996a6 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
@@ -27,7 +27,7 @@ import org.apache.wss4j.common.bsp.BSPRule;
 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.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.WSConstants;
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 44e08c8dd..b90ed9c92 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
@@ -31,10 +31,10 @@ 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;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.builder.SAML1Constants;
 import org.apache.wss4j.common.util.DateUtil;
 import org.apache.wss4j.common.util.KeyUtils;
 import org.apache.wss4j.common.util.SOAPUtil;
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 2cdaa24ad..734a86cb5 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
@@ -39,11 +39,11 @@ import org.apache.wss4j.common.cache.ReplayCache;
 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.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-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.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.bean.ConditionsBean;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerResult;
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 09e01c654..7f47c25fd 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
@@ -20,7 +20,7 @@
 package org.apache.wss4j.dom.message;
 
 import org.apache.wss4j.common.WSEncryptionPart;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.dom.SOAPConstants;
 import org.apache.wss4j.dom.WSDataRef;
@@ -39,9 +39,9 @@ import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.Merlin;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.builder.SAML1Constants;
 import org.apache.wss4j.common.util.Loader;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.saml.SignedSamlTokenHOKTest;
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 e834e45bb..9d3b99176 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
@@ -30,11 +30,11 @@ import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.principal.SAMLTokenPrincipal;
 import org.apache.wss4j.common.principal.UsernameTokenPrincipal;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.principal.SAMLTokenPrincipal;
 import org.apache.wss4j.common.token.BinarySecurity;
 import org.apache.wss4j.common.token.X509Security;
 import org.apache.wss4j.common.util.SOAPUtil;
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 c2f236ebc..96d4b1d5a 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
@@ -20,7 +20,7 @@
 package org.apache.wss4j.dom.saml;
 
 import javax.xml.crypto.dsig.CanonicalizationMethod;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -37,9 +37,9 @@ import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.dom.message.WSSecHeader;
 import org.apache.wss4j.dom.message.WSSecSAMLToken;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.builder.SAML1Constants;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.util.WSSecurityUtil;
 
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 a44475c73..c7aeb3107 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
@@ -25,9 +25,9 @@ import java.time.Instant;
 import javax.security.auth.callback.CallbackHandler;
 
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.WSConstants;
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 3fd642a6d..59d947bfe 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
@@ -28,15 +28,15 @@ import java.util.List;
 import javax.security.auth.callback.CallbackHandler;
 
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.bean.AudienceRestrictionBean;
-import org.apache.wss4j.common.saml.bean.ConditionsBean;
-import org.apache.wss4j.common.saml.bean.DelegateBean;
-import org.apache.wss4j.common.saml.bean.NameIDBean;
-import org.apache.wss4j.common.saml.bean.ProxyRestrictionBean;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.bean.AudienceRestrictionBean;
+import org.apache.wss4j.saml.bean.ConditionsBean;
+import org.apache.wss4j.saml.bean.DelegateBean;
+import org.apache.wss4j.saml.bean.NameIDBean;
+import org.apache.wss4j.saml.bean.ProxyRestrictionBean;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.WSConstants;
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 c18c967d9..1a86ef06e 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
@@ -19,7 +19,7 @@
 
 package org.apache.wss4j.dom.saml;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.common.AbstractSAMLCallbackHandler;
@@ -36,12 +36,12 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.crypto.Merlin;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.bean.SubjectBean;
-import org.apache.wss4j.common.saml.bean.Version;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.bean.SubjectBean;
+import org.apache.wss4j.saml.bean.Version;
+import org.apache.wss4j.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.Loader;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.message.WSSecHeader;
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 d19e724d2..ae68bd3d8 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
@@ -20,7 +20,7 @@
 package org.apache.wss4j.dom.saml;
 
 import org.apache.wss4j.common.WSEncryptionPart;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDataRef;
@@ -36,10 +36,10 @@ import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.Merlin;
-import org.apache.wss4j.common.saml.SAMLCallback;
-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.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.KeyUtils;
 import org.apache.wss4j.common.util.Loader;
 import org.apache.wss4j.common.util.XMLUtils;
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 9963c72a7..1f5377af2 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
@@ -30,7 +30,7 @@ import org.w3c.dom.Document;
 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.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.common.CustomHandler;
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 9b2543f1a..a1da4d46a 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
@@ -27,10 +27,10 @@ import java.util.TreeMap;
 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.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.builder.SAML1Constants;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.WSConstants;
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 4a44e9bc0..888d911c7 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
@@ -29,10 +29,10 @@ import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.builder.SAML1Constants;
 import org.apache.wss4j.common.token.SecurityTokenReference;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.common.util.XMLUtils;
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 09849f56d..1ea7550f0 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
@@ -19,7 +19,7 @@
 
 package org.apache.wss4j.dom.saml;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
@@ -33,10 +33,10 @@ import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
-import org.apache.wss4j.common.saml.SAMLCallback;
-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.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.message.WSSecHeader;
 import org.apache.wss4j.dom.message.WSSecSAMLToken;
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 4e541994f..67a9e794b 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
@@ -19,7 +19,7 @@
 
 package org.apache.wss4j.dom.saml;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDataRef;
@@ -33,10 +33,10 @@ import org.apache.wss4j.dom.engine.WSSecurityEngine;
 import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
-import org.apache.wss4j.common.saml.SAMLCallback;
-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.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
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 148e9dd47..466b41eb0 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
@@ -40,13 +40,13 @@ import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.bean.NameIDBean;
-import org.apache.wss4j.common.saml.bean.SubjectConfirmationDataBean;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.bean.NameIDBean;
+import org.apache.wss4j.saml.bean.SubjectConfirmationDataBean;
+import org.apache.wss4j.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.token.SecurityTokenReference;
 import org.apache.wss4j.common.util.DOM2Writer;
 import org.apache.wss4j.common.util.SOAPUtil;
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 f556528d1..58d412da9 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
@@ -19,7 +19,7 @@
 
 package org.apache.wss4j.dom.saml;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDataRef;
@@ -37,11 +37,11 @@ import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.crypto.Merlin;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.bean.KeyInfoBean.CERT_IDENTIFIER;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.bean.KeyInfoBean.CERT_IDENTIFIER;
+import org.apache.wss4j.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.Loader;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.message.WSSecHeader;
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..6ff2d4536 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
@@ -27,11 +27,11 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.crypto.Merlin;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLKeyInfo;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLKeyInfo;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.DOM2Writer;
 import org.apache.wss4j.common.util.Loader;
 import org.apache.wss4j.dom.common.SAML2CallbackHandler;
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 662f3d552..5afef7b54 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
@@ -30,9 +30,9 @@ import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.token.BinarySecurity;
 import org.apache.wss4j.common.token.X509Security;
 import org.apache.wss4j.common.util.SOAPUtil;
diff --git 
a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/IssuedTokenAssertionState.java
 
b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/IssuedTokenAssertionState.java
index e190d6f45..f9ba53a42 100644
--- 
a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/IssuedTokenAssertionState.java
+++ 
b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/IssuedTokenAssertionState.java
@@ -19,7 +19,7 @@
 package org.apache.wss4j.policy.stax.assertionStates;
 
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.WSSPolicyException;
 import org.apache.wss4j.policy.model.AbstractSecurityAssertion;
 import org.apache.wss4j.policy.model.AbstractToken;
diff --git 
a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SamlTokenAssertionState.java
 
b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SamlTokenAssertionState.java
index e14c8e9c5..a280eea29 100644
--- 
a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SamlTokenAssertionState.java
+++ 
b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SamlTokenAssertionState.java
@@ -20,7 +20,7 @@ package org.apache.wss4j.policy.stax.assertionStates;
 
 import javax.xml.namespace.QName;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.WSSPolicyException;
 import org.apache.wss4j.policy.SPConstants;
 import org.apache.wss4j.policy.model.AbstractSecurityAssertion;
diff --git 
a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java
 
b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java
index cfd834959..287f62d52 100644
--- 
a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java
+++ 
b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java
@@ -21,8 +21,8 @@ package org.apache.wss4j.policy.stax.test;
 import org.apache.neethi.builders.AssertionBuilder;
 import org.apache.wss4j.common.crypto.WSProviderConfig;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 
 import org.apache.wss4j.policy.SPConstants;
 import org.apache.wss4j.policy.stax.enforcer.PolicyEnforcer;
diff --git 
a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java
 
b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java
index 7a4711a8c..ec9113636 100644
--- 
a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java
+++ 
b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java
@@ -38,8 +38,8 @@ import org.apache.wss4j.common.bsp.BSPRule;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.crypto.Merlin;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.bean.Version;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.bean.Version;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.policy.stax.enforcer.PolicyEnforcer;
 import org.apache.wss4j.policy.stax.enforcer.PolicyInputProcessor;
 import org.apache.wss4j.stax.ext.WSSConstants;
diff --git 
a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/IssuedTokenTest.java
 
b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/IssuedTokenTest.java
index 5cefdd005..9311a4466 100644
--- 
a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/IssuedTokenTest.java
+++ 
b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/IssuedTokenTest.java
@@ -26,12 +26,12 @@ import java.util.List;
 import javax.xml.namespace.QName;
 
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.bean.AttributeBean;
-import org.apache.wss4j.common.saml.bean.AttributeStatementBean;
-import org.apache.wss4j.common.saml.bean.SubjectBean;
-import org.apache.wss4j.common.saml.bean.Version;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.bean.AttributeBean;
+import org.apache.wss4j.saml.bean.AttributeStatementBean;
+import org.apache.wss4j.saml.bean.SubjectBean;
+import org.apache.wss4j.saml.bean.Version;
 import org.apache.wss4j.policy.stax.PolicyViolationException;
 import org.apache.wss4j.policy.stax.enforcer.PolicyEnforcer;
 import org.apache.wss4j.stax.ext.WSSConstants;
diff --git 
a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java
 
b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java
index 7094aebb3..2fe8aaac7 100644
--- 
a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java
+++ 
b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java
@@ -24,10 +24,10 @@ import java.util.List;
 import javax.xml.namespace.QName;
 
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.bean.SubjectBean;
-import org.apache.wss4j.common.saml.bean.Version;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.bean.SubjectBean;
+import org.apache.wss4j.saml.bean.Version;
 import org.apache.wss4j.policy.stax.PolicyViolationException;
 import org.apache.wss4j.policy.stax.enforcer.PolicyEnforcer;
 import org.apache.wss4j.stax.ext.WSSConstants;
diff --git 
a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SupportingTokensTest.java
 
b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SupportingTokensTest.java
index f264e7abb..2ede993cb 100644
--- 
a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SupportingTokensTest.java
+++ 
b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SupportingTokensTest.java
@@ -25,10 +25,10 @@ import javax.xml.namespace.QName;
 
 import org.apache.wss4j.common.WSSPolicyException;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.bean.SubjectBean;
-import org.apache.wss4j.common.saml.bean.Version;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.bean.SubjectBean;
+import org.apache.wss4j.saml.bean.Version;
 import org.apache.wss4j.common.util.DateUtil;
 import org.apache.wss4j.policy.stax.enforcer.PolicyEnforcer;
 import org.apache.wss4j.stax.ext.WSSConstants;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/OpenSAMLBootstrap.java 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/OpenSAMLBootstrap.java
index f3858401c..10677904c 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/OpenSAMLBootstrap.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/OpenSAMLBootstrap.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.saml;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/OpenSAMLUtil.java 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/OpenSAMLUtil.java
index 0305686b6..086cb6e81 100644
--- a/ws-security-saml/src/main/java/org/apache/wss4j/saml/OpenSAMLUtil.java
+++ b/ws-security-saml/src/main/java/org/apache/wss4j/saml/OpenSAMLUtil.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.saml;
 
 import javax.xml.namespace.QName;
 
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLCallback.java 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLCallback.java
index b567ce915..4bde6ed61 100644
--- a/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLCallback.java
+++ b/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLCallback.java
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.saml;
 
 import org.apache.wss4j.common.crypto.Crypto;
-import org.apache.wss4j.common.saml.bean.AdviceBean;
-import org.apache.wss4j.common.saml.bean.AttributeStatementBean;
-import org.apache.wss4j.common.saml.bean.AuthDecisionStatementBean;
-import org.apache.wss4j.common.saml.bean.AuthenticationStatementBean;
-import org.apache.wss4j.common.saml.bean.ConditionsBean;
-import org.apache.wss4j.common.saml.bean.SubjectBean;
-import org.apache.wss4j.common.saml.bean.Version;
+import org.apache.wss4j.saml.bean.AdviceBean;
+import org.apache.wss4j.saml.bean.AttributeStatementBean;
+import org.apache.wss4j.saml.bean.AuthDecisionStatementBean;
+import org.apache.wss4j.saml.bean.AuthenticationStatementBean;
+import org.apache.wss4j.saml.bean.ConditionsBean;
+import org.apache.wss4j.saml.bean.SubjectBean;
+import org.apache.wss4j.saml.bean.Version;
 import org.opensaml.saml.common.SAMLVersion;
 import org.w3c.dom.Element;
 
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLKeyInfo.java 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLKeyInfo.java
index 9944cbc18..9d2d7a3d2 100644
--- a/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLKeyInfo.java
+++ b/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLKeyInfo.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.saml;
 
 import java.security.PublicKey;
 import java.security.cert.X509Certificate;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLKeyInfoProcessor.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLKeyInfoProcessor.java
index d2f1cc4bc..36c0bde7f 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLKeyInfoProcessor.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLKeyInfoProcessor.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.saml;
 
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.w3c.dom.Element;
diff --git a/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLUtil.java 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLUtil.java
index 09a681550..7b48f19cf 100644
--- a/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLUtil.java
+++ b/ws-security-saml/src/main/java/org/apache/wss4j/saml/SAMLUtil.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.saml;
 
 import java.io.IOException;
 import java.security.NoSuchProviderException;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/SamlAssertionWrapper.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/SamlAssertionWrapper.java
index e158570bb..14a69d1dd 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/SamlAssertionWrapper.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/SamlAssertionWrapper.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.saml;
 
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
@@ -28,8 +28,8 @@ import java.util.List;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.builder.SAML1ComponentBuilder;
-import org.apache.wss4j.common.saml.builder.SAML2ComponentBuilder;
+import org.apache.wss4j.saml.builder.SAML1ComponentBuilder;
+import org.apache.wss4j.saml.builder.SAML2ComponentBuilder;
 import org.apache.wss4j.common.util.DOM2Writer;
 import org.apache.wss4j.common.util.InetAddressUtils;
 import org.apache.xml.security.stax.impl.util.IDGenerator;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/WSS4JXSBase64BinaryUnmarshaller.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/WSS4JXSBase64BinaryUnmarshaller.java
index 8827d8145..d06c2c356 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/WSS4JXSBase64BinaryUnmarshaller.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/WSS4JXSBase64BinaryUnmarshaller.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.saml;
 
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import org.opensaml.core.xml.XMLObject;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/ActionBean.java 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/ActionBean.java
index bc31163d3..cba1b814e 100644
--- a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/ActionBean.java
+++ b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/ActionBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 
 /**
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AdviceBean.java 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AdviceBean.java
index 5d10eec7a..2dc2eb351 100644
--- a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AdviceBean.java
+++ b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AdviceBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AttributeBean.java 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AttributeBean.java
index 3b1aa4c49..b11f3f711 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AttributeBean.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AttributeBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AttributeStatementBean.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AttributeStatementBean.java
index 486840c11..541918ef7 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AttributeStatementBean.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AttributeStatementBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AudienceRestrictionBean.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AudienceRestrictionBean.java
index 0bf0e1ede..bdaf34fac 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AudienceRestrictionBean.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AudienceRestrictionBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AuthDecisionStatementBean.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AuthDecisionStatementBean.java
index 62326d2a3..cc8caa66c 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AuthDecisionStatementBean.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AuthDecisionStatementBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AuthenticationStatementBean.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AuthenticationStatementBean.java
index dfff5458e..3d94f8c74 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AuthenticationStatementBean.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/AuthenticationStatementBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 import java.time.Instant;
 
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/ConditionsBean.java 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/ConditionsBean.java
index 139ed2fcf..1dc624ed2 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/ConditionsBean.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/ConditionsBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 import java.time.Instant;
 import java.util.Date;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/DelegateBean.java 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/DelegateBean.java
index c324ef1db..88cab24c9 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/DelegateBean.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/DelegateBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 import java.time.Instant;
 import java.util.Date;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/KeyInfoBean.java 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/KeyInfoBean.java
index 3d6ef6bce..990cdb1cc 100644
--- a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/KeyInfoBean.java
+++ b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/KeyInfoBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 import java.security.PublicKey;
 import java.security.cert.X509Certificate;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/NameIDBean.java 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/NameIDBean.java
index db91e3294..a2a827afd 100644
--- a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/NameIDBean.java
+++ b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/NameIDBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 /**
  * Class NameIDBean represents a SAML NameID (can be used to create both SAML 
v1.1 and v2.0 statements)
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/ProxyRestrictionBean.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/ProxyRestrictionBean.java
index 7546817c2..5dc7c083c 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/ProxyRestrictionBean.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/ProxyRestrictionBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/SubjectBean.java 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/SubjectBean.java
index 067daf87a..db2474dd7 100644
--- a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/SubjectBean.java
+++ b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/SubjectBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 /**
  * Class SubjectBean represents a SAML subject (can be used to create
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/SubjectConfirmationDataBean.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/SubjectConfirmationDataBean.java
index 746a6343c..95301747f 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/SubjectConfirmationDataBean.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/SubjectConfirmationDataBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 import java.time.Instant;
 import java.util.ArrayList;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/SubjectLocalityBean.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/SubjectLocalityBean.java
index f02e2cfac..952fbdc4e 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/SubjectLocalityBean.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/SubjectLocalityBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 /**
  * This class represents a SubjectLocality.
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/Version.java 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/Version.java
index 66e9d6c0f..7da6f960b 100644
--- a/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/Version.java
+++ b/ws-security-saml/src/main/java/org/apache/wss4j/saml/bean/Version.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.saml.bean;
 
 
 /**
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML1ComponentBuilder.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML1ComponentBuilder.java
index 44f24ff9e..4e59eac1f 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML1ComponentBuilder.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML1ComponentBuilder.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.builder;
+package org.apache.wss4j.saml.builder;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -25,18 +25,18 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.OpenSAMLUtil;
-import org.apache.wss4j.common.saml.bean.ActionBean;
-import org.apache.wss4j.common.saml.bean.AdviceBean;
-import org.apache.wss4j.common.saml.bean.AttributeBean;
-import org.apache.wss4j.common.saml.bean.AttributeStatementBean;
-import org.apache.wss4j.common.saml.bean.AudienceRestrictionBean;
-import org.apache.wss4j.common.saml.bean.AuthDecisionStatementBean;
-import org.apache.wss4j.common.saml.bean.AuthenticationStatementBean;
-import org.apache.wss4j.common.saml.bean.ConditionsBean;
-import org.apache.wss4j.common.saml.bean.KeyInfoBean;
-import org.apache.wss4j.common.saml.bean.SubjectBean;
-import org.apache.wss4j.common.saml.bean.SubjectLocalityBean;
+import org.apache.wss4j.saml.OpenSAMLUtil;
+import org.apache.wss4j.saml.bean.ActionBean;
+import org.apache.wss4j.saml.bean.AdviceBean;
+import org.apache.wss4j.saml.bean.AttributeBean;
+import org.apache.wss4j.saml.bean.AttributeStatementBean;
+import org.apache.wss4j.saml.bean.AudienceRestrictionBean;
+import org.apache.wss4j.saml.bean.AuthDecisionStatementBean;
+import org.apache.wss4j.saml.bean.AuthenticationStatementBean;
+import org.apache.wss4j.saml.bean.ConditionsBean;
+import org.apache.wss4j.saml.bean.KeyInfoBean;
+import org.apache.wss4j.saml.bean.SubjectBean;
+import org.apache.wss4j.saml.bean.SubjectLocalityBean;
 import org.apache.xml.security.stax.impl.util.IDGenerator;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.XMLObjectBuilderFactory;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML1Constants.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML1Constants.java
index 67c0bdd41..61bed4f37 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML1Constants.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML1Constants.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.builder;
+package org.apache.wss4j.saml.builder;
 
 
 /**
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML2ComponentBuilder.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML2ComponentBuilder.java
index bff03d14d..5e9092e44 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML2ComponentBuilder.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML2ComponentBuilder.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.builder;
+package org.apache.wss4j.saml.builder;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -26,22 +26,22 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.OpenSAMLUtil;
-import org.apache.wss4j.common.saml.bean.ActionBean;
-import org.apache.wss4j.common.saml.bean.AdviceBean;
-import org.apache.wss4j.common.saml.bean.AttributeBean;
-import org.apache.wss4j.common.saml.bean.AttributeStatementBean;
-import org.apache.wss4j.common.saml.bean.AudienceRestrictionBean;
-import org.apache.wss4j.common.saml.bean.AuthDecisionStatementBean;
-import org.apache.wss4j.common.saml.bean.AuthenticationStatementBean;
-import org.apache.wss4j.common.saml.bean.ConditionsBean;
-import org.apache.wss4j.common.saml.bean.DelegateBean;
-import org.apache.wss4j.common.saml.bean.KeyInfoBean;
-import org.apache.wss4j.common.saml.bean.NameIDBean;
-import org.apache.wss4j.common.saml.bean.ProxyRestrictionBean;
-import org.apache.wss4j.common.saml.bean.SubjectBean;
-import org.apache.wss4j.common.saml.bean.SubjectConfirmationDataBean;
-import org.apache.wss4j.common.saml.bean.SubjectLocalityBean;
+import org.apache.wss4j.saml.OpenSAMLUtil;
+import org.apache.wss4j.saml.bean.ActionBean;
+import org.apache.wss4j.saml.bean.AdviceBean;
+import org.apache.wss4j.saml.bean.AttributeBean;
+import org.apache.wss4j.saml.bean.AttributeStatementBean;
+import org.apache.wss4j.saml.bean.AudienceRestrictionBean;
+import org.apache.wss4j.saml.bean.AuthDecisionStatementBean;
+import org.apache.wss4j.saml.bean.AuthenticationStatementBean;
+import org.apache.wss4j.saml.bean.ConditionsBean;
+import org.apache.wss4j.saml.bean.DelegateBean;
+import org.apache.wss4j.saml.bean.KeyInfoBean;
+import org.apache.wss4j.saml.bean.NameIDBean;
+import org.apache.wss4j.saml.bean.ProxyRestrictionBean;
+import org.apache.wss4j.saml.bean.SubjectBean;
+import org.apache.wss4j.saml.bean.SubjectConfirmationDataBean;
+import org.apache.wss4j.saml.bean.SubjectLocalityBean;
 import org.apache.xml.security.stax.impl.util.IDGenerator;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.XMLObjectBuilderFactory;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML2Constants.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML2Constants.java
index 5426f113a..b777a7060 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML2Constants.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/builder/SAML2Constants.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.builder;
+package org.apache.wss4j.saml.builder;
 
 
 /**
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/principal/SAMLTokenPrincipal.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/principal/SAMLTokenPrincipal.java
index e83601960..d6fe357ba 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/principal/SAMLTokenPrincipal.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/principal/SAMLTokenPrincipal.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wss4j.common.principal;
+package org.apache.wss4j.saml.principal;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 
 import java.security.Principal;
 
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/principal/SAMLTokenPrincipalImpl.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/principal/SAMLTokenPrincipalImpl.java
index 85e9e802e..a10c56092 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/principal/SAMLTokenPrincipalImpl.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/principal/SAMLTokenPrincipalImpl.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.principal;
+package org.apache.wss4j.saml.principal;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 
 import java.io.Serializable;
 
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/processor/SAMLTokenProcessor.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/saml/processor/SAMLTokenProcessor.java
deleted file mode 100644
index 491c655d9..000000000
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/saml/processor/SAMLTokenProcessor.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.wss4j.dom.processor;
-
-import java.security.NoSuchProviderException;
-import java.security.Provider;
-import java.security.PublicKey;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.crypto.MarshalException;
-import javax.xml.crypto.dsig.Reference;
-import javax.xml.crypto.dsig.Transform;
-import javax.xml.crypto.dsig.XMLSignature;
-import javax.xml.crypto.dsig.XMLSignatureFactory;
-import javax.xml.crypto.dsig.XMLValidateContext;
-import javax.xml.crypto.dsig.dom.DOMValidateContext;
-import javax.xml.namespace.QName;
-
-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.common.principal.SAMLTokenPrincipalImpl;
-import org.apache.wss4j.common.saml.SAMLKeyInfo;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.util.DOM2Writer;
-import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
-import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
-import org.apache.wss4j.dom.handler.RequestData;
-import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor;
-import org.apache.wss4j.dom.util.EncryptionUtils;
-import org.apache.wss4j.dom.validate.Credential;
-import org.apache.wss4j.dom.validate.Validator;
-import org.opensaml.xmlsec.signature.KeyInfo;
-import org.opensaml.xmlsec.signature.Signature;
-import org.w3c.dom.Element;
-
-public class SAMLTokenProcessor implements Processor {
-    private static final org.slf4j.Logger LOG =
-        org.slf4j.LoggerFactory.getLogger(SAMLTokenProcessor.class);
-    private XMLSignatureFactory signatureFactory;
-
-    public SAMLTokenProcessor() {
-        init(null);
-    }
-
-    public SAMLTokenProcessor(Provider provider) {
-        init(provider);
-    }
-
-    private void init(Provider provider) {
-        if (provider == null) {
-            // Try to install the Santuario Provider - fall back to the JDK 
provider if this does
-            // not work
-            try {
-                signatureFactory = XMLSignatureFactory.getInstance("DOM", 
"ApacheXMLDSig");
-            } catch (NoSuchProviderException ex) {
-                signatureFactory = XMLSignatureFactory.getInstance("DOM");
-            }
-        } else {
-            signatureFactory = XMLSignatureFactory.getInstance("DOM", 
provider);
-        }
-    }
-
-    public List<WSSecurityEngineResult> handleToken(
-        Element elem,
-        RequestData data
-    ) throws WSSecurityException {
-        LOG.debug("Found SAML Assertion element");
-
-        Validator validator =
-            data.getValidator(new QName(elem.getNamespaceURI(), 
elem.getLocalName()));
-
-        SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(elem);
-        XMLSignature xmlSignature = 
verifySignatureKeysAndAlgorithms(samlAssertion, data);
-        List<WSDataRef> dataRefs = createDataRefs(elem, samlAssertion, 
xmlSignature);
-
-        Credential credential = handleSAMLToken(samlAssertion, data, 
validator);
-        samlAssertion = credential.getSamlAssertion();
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("SAML Assertion issuer " + 
samlAssertion.getIssuerString());
-            LOG.debug(DOM2Writer.nodeToString(elem));
-        }
-
-        // See if the token has been previously processed
-        String id = samlAssertion.getId();
-        Element foundElement = data.getWsDocInfo().getTokenElement(id);
-        if (elem.equals(foundElement)) {
-            WSSecurityEngineResult result = data.getWsDocInfo().getResult(id);
-            return java.util.Collections.singletonList(result);
-        } else if (foundElement != null) {
-            throw new WSSecurityException(
-                WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN, 
"duplicateError"
-            );
-        }
-
-        data.getWsDocInfo().addTokenElement(elem);
-        WSSecurityEngineResult result = null;
-        if (samlAssertion.isSigned()) {
-            result = new WSSecurityEngineResult(WSConstants.ST_SIGNED, 
samlAssertion);
-            result.put(WSSecurityEngineResult.TAG_DATA_REF_URIS, dataRefs);
-            result.put(WSSecurityEngineResult.TAG_SIGNATURE_VALUE, 
samlAssertion.getSignatureValue());
-        } else {
-            result = new WSSecurityEngineResult(WSConstants.ST_UNSIGNED, 
samlAssertion);
-        }
-
-        if (id.length() != 0) {
-            result.put(WSSecurityEngineResult.TAG_ID, id);
-        }
-
-        if (validator != null) {
-            result.put(WSSecurityEngineResult.TAG_VALIDATED_TOKEN, 
Boolean.TRUE);
-            if (credential.getTransformedToken() != null) {
-                result.put(
-                    WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN, 
credential.getTransformedToken()
-                );
-                if (credential.getPrincipal() != null) {
-                    result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
credential.getPrincipal());
-                } else {
-                    SAMLTokenPrincipalImpl samlPrincipal =
-                        new 
SAMLTokenPrincipalImpl(credential.getTransformedToken());
-                    result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
samlPrincipal);
-                }
-            } else if (credential.getPrincipal() != null) {
-                result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
credential.getPrincipal());
-            } else {
-                result.put(WSSecurityEngineResult.TAG_PRINCIPAL, new 
SAMLTokenPrincipalImpl(samlAssertion));
-            }
-            result.put(WSSecurityEngineResult.TAG_SUBJECT, 
credential.getSubject());
-        }
-        data.getWsDocInfo().addResult(result);
-        return java.util.Collections.singletonList(result);
-    }
-
-    public Credential handleSAMLToken(
-        SamlAssertionWrapper samlAssertion,
-        RequestData data,
-        Validator validator
-    ) throws WSSecurityException {
-        // Parse the subject if it exists
-        samlAssertion.parseSubject(
-            new WSSSAMLKeyInfoProcessor(data), data.getSigVerCrypto()
-        );
-
-        // Now delegate the rest of the verification to the Validator
-        Credential credential = new Credential();
-        credential.setSamlAssertion(samlAssertion);
-        if (validator != null) {
-            return validator.validate(credential, data);
-        }
-        return credential;
-    }
-
-    private XMLSignature verifySignatureKeysAndAlgorithms(
-        SamlAssertionWrapper samlAssertion,
-        RequestData data
-    ) throws WSSecurityException {
-        if (samlAssertion.isSigned()) {
-            Signature sig = samlAssertion.getSignature();
-            KeyInfo keyInfo = sig.getKeyInfo();
-            if (keyInfo == null) {
-                throw new WSSecurityException(
-                    WSSecurityException.ErrorCode.FAILURE, 
"invalidSAMLsecurity",
-                    new Object[] {"cannot get certificate or key"}
-                );
-            }
-            SAMLKeyInfo samlKeyInfo =
-                SAMLUtil.getCredentialFromKeyInfo(
-                    keyInfo.getDOM(), new WSSSAMLKeyInfoProcessor(data), 
data.getSigVerCrypto()
-                );
-
-            PublicKey key = null;
-            if (samlKeyInfo.getCerts() != null && samlKeyInfo.getCerts()[0] != 
null) {
-                key = samlKeyInfo.getCerts()[0].getPublicKey();
-            } else if (samlKeyInfo.getPublicKey() != null) {
-                key = samlKeyInfo.getPublicKey();
-            } else {
-                throw new WSSecurityException(
-                    WSSecurityException.ErrorCode.FAILURE, 
"invalidSAMLsecurity",
-                    new Object[] {"cannot get certificate or key"});
-            }
-
-            // Not checking signature here, just marshalling into an 
XMLSignature
-            // structure for testing the transform/digest algorithms etc.
-            XMLValidateContext context = new DOMValidateContext(key, 
sig.getDOM());
-            context.setProperty("org.apache.jcp.xml.dsig.secureValidation", 
Boolean.TRUE);
-            context.setProperty("org.jcp.xml.dsig.secureValidation", 
Boolean.TRUE);
-            if (data.getSignatureProvider() != null) {
-                
context.setProperty("org.jcp.xml.dsig.internal.dom.SignatureProvider", 
data.getSignatureProvider());
-            }
-
-            XMLSignature xmlSignature;
-            try {
-                xmlSignature = signatureFactory.unmarshalXMLSignature(context);
-            } catch (MarshalException ex) {
-                throw new WSSecurityException(
-                    WSSecurityException.ErrorCode.FAILED_CHECK, ex, 
"invalidSAMLsecurity",
-                    new Object[] {"cannot get certificate or key"}
-                );
-            }
-
-            // Check for compliance against the defined AlgorithmSuite
-            AlgorithmSuite algorithmSuite = data.getSamlAlgorithmSuite();
-            if (algorithmSuite != null) {
-                AlgorithmSuiteValidator algorithmSuiteValidator = new
-                    AlgorithmSuiteValidator(algorithmSuite);
-
-                algorithmSuiteValidator.checkSignatureAlgorithms(xmlSignature);
-
-                if (samlKeyInfo.getCerts() != null && 
samlKeyInfo.getCerts().length > 0) {
-                    
algorithmSuiteValidator.checkAsymmetricKeyLength(samlKeyInfo.getCerts());
-                } else {
-                    algorithmSuiteValidator.checkAsymmetricKeyLength(key);
-                }
-            }
-
-            samlAssertion.verifySignature(samlKeyInfo);
-
-            return xmlSignature;
-        }
-
-        return null;
-    }
-
-    private List<WSDataRef> createDataRefs(
-        Element token, SamlAssertionWrapper samlAssertion, XMLSignature 
xmlSignature
-    ) {
-        if (xmlSignature == null) {
-            return Collections.emptyList();
-        }
-
-        List<WSDataRef> protectedRefs = new ArrayList<>();
-        String signatureMethod =
-            xmlSignature.getSignedInfo().getSignatureMethod().getAlgorithm();
-
-        for (Object refObject : xmlSignature.getSignedInfo().getReferences()) {
-            Reference reference = (Reference)refObject;
-
-            if (reference.getURI() == null || reference.getURI().length() == 0
-                || reference.getURI().equals(samlAssertion.getId())
-                || reference.getURI().equals("#" + samlAssertion.getId())) {
-                WSDataRef ref = new WSDataRef();
-                ref.setWsuId(reference.getURI());
-                ref.setProtectedElement(token);
-                ref.setAlgorithm(signatureMethod);
-                
ref.setDigestAlgorithm(reference.getDigestMethod().getAlgorithm());
-                ref.setDigestValue(reference.getDigestValue());
-
-                // Set the Transform algorithms as well
-                @SuppressWarnings("unchecked")
-                List<Transform> transforms = reference.getTransforms();
-                List<String> transformAlgorithms = new 
ArrayList<>(transforms.size());
-                for (Transform transform : transforms) {
-                    transformAlgorithms.add(transform.getAlgorithm());
-                }
-                ref.setTransformAlgorithms(transformAlgorithms);
-
-                ref.setXpath(EncryptionUtils.getXPath(token));
-                protectedRefs.add(ref);
-            }
-        }
-
-        return protectedRefs;
-    }
-}
diff --git a/ws-security-saml/src/main/resources/wss4j-signature-config.xml 
b/ws-security-saml/src/main/resources/wss4j-signature-config.xml
index 07ee51572..86e66a3b9 100644
--- a/ws-security-saml/src/main/resources/wss4j-signature-config.xml
+++ b/ws-security-saml/src/main/resources/wss4j-signature-config.xml
@@ -7,7 +7,7 @@
         <ObjectProvider qualifiedName="ds:X509Certificate">
             <BuilderClass 
className="org.opensaml.xmlsec.signature.impl.X509CertificateBuilder"/>
             <MarshallingClass 
className="org.opensaml.core.xml.schema.impl.XSBase64BinaryMarshaller"/>
-            <UnmarshallingClass 
className="org.apache.wss4j.common.saml.WSS4JXSBase64BinaryUnmarshaller"/>
+            <UnmarshallingClass 
className="org.apache.wss4j.saml.WSS4JXSBase64BinaryUnmarshaller"/>
         </ObjectProvider>
 
     </ObjectProviders>
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/OpenSAMLUtilTest.java
 b/ws-security-saml/src/test/java/org/apache/wss4j/saml/OpenSAMLUtilTest.java
similarity index 96%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/OpenSAMLUtilTest.java
rename to 
ws-security-saml/src/test/java/org/apache/wss4j/saml/OpenSAMLUtilTest.java
index 8cc20b258..88fa22ac4 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/OpenSAMLUtilTest.java
+++ b/ws-security-saml/src/test/java/org/apache/wss4j/saml/OpenSAMLUtilTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.saml;
 
 import org.junit.jupiter.api.Test;
 
diff --git 
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
 
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
index c47c247f3..d6475a0c4 100644
--- 
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
+++ 
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
@@ -43,8 +43,8 @@ import javax.xml.stream.events.ProcessingInstruction;
 import org.apache.wss4j.binding.wss10.ObjectFactory;
 import org.apache.wss4j.binding.wss10.SecurityTokenReferenceType;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.OpenSAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.OpenSAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.stax.ext.WSInboundSecurityContext;
 import org.apache.wss4j.stax.ext.WSSConstants;
 import org.apache.wss4j.stax.ext.WSSSecurityProperties;
diff --git 
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
 
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
index 3a4cd5aa2..4461ef59f 100644
--- 
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
+++ 
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
@@ -33,12 +33,12 @@ import javax.xml.stream.XMLStreamException;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.ext.WSPasswordCallback;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.OpenSAMLUtil;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.bean.KeyInfoBean;
-import org.apache.wss4j.common.saml.bean.SubjectBean;
+import org.apache.wss4j.saml.OpenSAMLUtil;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.bean.KeyInfoBean;
+import org.apache.wss4j.saml.bean.SubjectBean;
 import org.apache.wss4j.stax.ext.WSSConfigurationException;
 import org.apache.wss4j.stax.ext.WSSConstants;
 import org.apache.wss4j.stax.ext.WSSSecurePart;
diff --git 
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java
 
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java
index a43ac6a1c..12167e543 100644
--- 
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java
+++ 
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java
@@ -37,11 +37,11 @@ import org.w3c.dom.Element;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.ext.WSPasswordCallback;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.principal.SAMLTokenPrincipal;
-import org.apache.wss4j.common.saml.OpenSAMLUtil;
-import org.apache.wss4j.common.saml.SAMLKeyInfo;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.OpenSAMLUtil;
+import org.apache.wss4j.saml.SAMLKeyInfo;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.principal.SAMLTokenPrincipal;
 import org.apache.wss4j.stax.ext.WSInboundSecurityContext;
 import org.apache.wss4j.stax.ext.WSSConstants;
 import org.apache.wss4j.stax.ext.WSSSecurityProperties;
diff --git 
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/SamlTokenSecurityEvent.java
 
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/SamlTokenSecurityEvent.java
index d81308924..3d121e464 100644
--- 
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/SamlTokenSecurityEvent.java
+++ 
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/SamlTokenSecurityEvent.java
@@ -19,8 +19,8 @@
 package org.apache.wss4j.stax.securityEvent;
 
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.principal.SAMLTokenPrincipal;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.principal.SAMLTokenPrincipal;
 import org.apache.wss4j.stax.securityToken.SamlSecurityToken;
 
 public class SamlTokenSecurityEvent extends 
IssuedTokenSecurityEvent<SamlSecurityToken> {
diff --git 
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/SamlSecurityToken.java
 
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/SamlSecurityToken.java
index 6f54c7286..40642c3b1 100644
--- 
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/SamlSecurityToken.java
+++ 
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/SamlSecurityToken.java
@@ -18,7 +18,7 @@
  */
 package org.apache.wss4j.stax.securityToken;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 
 public interface SamlSecurityToken extends SubjectAndPrincipalSecurityToken {
 
diff --git 
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidator.java
 
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidator.java
index e4b94b6f0..6e7508309 100644
--- 
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidator.java
+++ 
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidator.java
@@ -19,7 +19,7 @@
 package org.apache.wss4j.stax.validate;
 
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
 import org.apache.wss4j.stax.securityToken.SamlSecurityToken;
 import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
 
diff --git 
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidatorImpl.java
 
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidatorImpl.java
index 235742cca..910efec36 100644
--- 
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidatorImpl.java
+++ 
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidatorImpl.java
@@ -24,10 +24,10 @@ import java.util.List;
 import org.apache.wss4j.common.cache.ReplayCache;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.OpenSAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.OpenSAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.stax.securityToken.SamlSecurityToken;
 import org.apache.wss4j.stax.impl.securityToken.SamlSecurityTokenImpl;
 import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
diff --git 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/CallbackHandlerImpl.java
 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/CallbackHandlerImpl.java
index 5c050b3b1..b5066834c 100644
--- 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/CallbackHandlerImpl.java
+++ 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/CallbackHandlerImpl.java
@@ -26,7 +26,7 @@ import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
 import org.apache.wss4j.common.ext.WSPasswordCallback;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML1Constants;
 
 public class CallbackHandlerImpl implements CallbackHandler {
 
diff --git 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java
 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java
index 4a9502fa0..c6a1146d7 100644
--- 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java
+++ 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java
@@ -31,10 +31,10 @@ import javax.xml.namespace.QName;
 
 import org.apache.wss4j.common.crypto.WSProviderConfig;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.bean.SubjectBean;
-import org.apache.wss4j.common.saml.bean.Version;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.bean.SubjectBean;
+import org.apache.wss4j.saml.bean.Version;
 import org.apache.wss4j.common.util.DateUtil;
 import org.apache.wss4j.stax.ext.WSSConstants;
 import org.apache.wss4j.stax.impl.InboundWSSecurityContextImpl;
diff --git 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java
index 7b0fdaad5..e53cdb4b5 100644
--- 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java
+++ 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java
@@ -31,6 +31,7 @@ import javax.xml.transform.stream.StreamResult;
 
 import org.apache.wss4j.common.bsp.BSPRule;
 import org.apache.wss4j.common.principal.*;
+import org.apache.wss4j.saml.principal.SAMLTokenPrincipal;
 import org.apache.wss4j.stax.securityToken.KeyValueSecurityToken;
 import org.apache.wss4j.stax.securityToken.SamlSecurityToken;
 import org.apache.wss4j.stax.securityToken.UsernameSecurityToken;
diff --git 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java
index df62e2add..68e8502ae 100644
--- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java
+++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java
@@ -32,8 +32,8 @@ import javax.xml.transform.stream.StreamResult;
 import org.apache.wss4j.common.cache.EHCacheReplayCache;
 import org.apache.wss4j.common.cache.ReplayCache;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.bean.ConditionsBean;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.bean.ConditionsBean;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
 import org.apache.wss4j.stax.ext.WSSConstants;
diff --git 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/CustomContentsTest.java
 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/CustomContentsTest.java
index 3a054bd94..6421d9ab3 100644
--- 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/CustomContentsTest.java
+++ 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/CustomContentsTest.java
@@ -19,11 +19,11 @@
 package org.apache.wss4j.stax.test.saml;
 
 import org.apache.wss4j.common.WSS4JConstants;
-import org.apache.wss4j.common.saml.OpenSAMLUtil;
-import org.apache.wss4j.common.saml.bean.AttributeBean;
-import org.apache.wss4j.common.saml.bean.AttributeStatementBean;
-import org.apache.wss4j.common.saml.bean.SubjectConfirmationDataBean;
-import org.apache.wss4j.common.saml.bean.Version;
+import org.apache.wss4j.saml.OpenSAMLUtil;
+import org.apache.wss4j.saml.bean.AttributeBean;
+import org.apache.wss4j.saml.bean.AttributeStatementBean;
+import org.apache.wss4j.saml.bean.SubjectConfirmationDataBean;
+import org.apache.wss4j.saml.bean.Version;
 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/SAML1CallbackHandler.java
 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAML1CallbackHandler.java
index c9c83fab2..901b47d64 100755
--- 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAML1CallbackHandler.java
+++ 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAML1CallbackHandler.java
@@ -22,8 +22,8 @@ package org.apache.wss4j.stax.test.saml;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.builder.SAML1Constants;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.UnsupportedCallbackException;
diff --git 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAML2CallbackHandler.java
 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAML2CallbackHandler.java
index 1ac4816e4..3020275da 100755
--- 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAML2CallbackHandler.java
+++ 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAML2CallbackHandler.java
@@ -22,8 +22,8 @@ package org.apache.wss4j.stax.test.saml;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.UnsupportedCallbackException;
diff --git 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLCallbackHandlerImpl.java
 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLCallbackHandlerImpl.java
index 8084c0115..51a6c93db 100644
--- 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLCallbackHandlerImpl.java
+++ 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLCallbackHandlerImpl.java
@@ -35,21 +35,21 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.apache.wss4j.common.crypto.Merlin;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.bean.ActionBean;
-import org.apache.wss4j.common.saml.bean.AttributeBean;
-import org.apache.wss4j.common.saml.bean.AttributeStatementBean;
-import org.apache.wss4j.common.saml.bean.AuthDecisionStatementBean;
-import org.apache.wss4j.common.saml.bean.AuthenticationStatementBean;
-import org.apache.wss4j.common.saml.bean.ConditionsBean;
-import org.apache.wss4j.common.saml.bean.KeyInfoBean;
-import org.apache.wss4j.common.saml.bean.NameIDBean;
-import org.apache.wss4j.common.saml.bean.SubjectBean;
-import org.apache.wss4j.common.saml.bean.SubjectConfirmationDataBean;
-import org.apache.wss4j.common.saml.bean.SubjectLocalityBean;
-import org.apache.wss4j.common.saml.bean.Version;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.bean.ActionBean;
+import org.apache.wss4j.saml.bean.AttributeBean;
+import org.apache.wss4j.saml.bean.AttributeStatementBean;
+import org.apache.wss4j.saml.bean.AuthDecisionStatementBean;
+import org.apache.wss4j.saml.bean.AuthenticationStatementBean;
+import org.apache.wss4j.saml.bean.ConditionsBean;
+import org.apache.wss4j.saml.bean.KeyInfoBean;
+import org.apache.wss4j.saml.bean.NameIDBean;
+import org.apache.wss4j.saml.bean.SubjectBean;
+import org.apache.wss4j.saml.bean.SubjectConfirmationDataBean;
+import org.apache.wss4j.saml.bean.SubjectLocalityBean;
+import org.apache.wss4j.saml.bean.Version;
+import org.apache.wss4j.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.KeyUtils;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.message.WSSecEncryptedKey;
diff --git 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java
 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java
index 1a3d8aa2c..bcc5426d8 100644
--- 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java
+++ 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java
@@ -36,13 +36,13 @@ import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.crypto.Merlin;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.bean.KeyInfoBean;
-import org.apache.wss4j.common.saml.bean.Version;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.bean.KeyInfoBean;
+import org.apache.wss4j.saml.bean.Version;
+import org.apache.wss4j.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
 import org.apache.wss4j.dom.message.WSSecHeader;
diff --git 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java
 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java
index 4830a0945..85aa4222d 100755
--- 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java
+++ 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java
@@ -28,8 +28,8 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
 import org.apache.wss4j.stax.ext.WSSConstants;
diff --git 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java
 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java
index 4af943313..211c0fffa 100644
--- 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java
+++ 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java
@@ -39,12 +39,12 @@ import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.crypto.Merlin;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.bean.Version;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.bean.Version;
+import org.apache.wss4j.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.KeyUtils;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.dom.WSConstants;
diff --git 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenSVTest.java
 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenSVTest.java
index 6d9ccdd4d..91df3ec37 100644
--- 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenSVTest.java
+++ 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenSVTest.java
@@ -32,9 +32,9 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
 import org.apache.wss4j.common.crypto.CryptoType;
-import org.apache.wss4j.common.saml.bean.Version;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.bean.Version;
+import org.apache.wss4j.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 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/SAMLTokenTest.java
 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java
index 87161d205..0cee8682f 100644
--- 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java
+++ 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java
@@ -44,12 +44,12 @@ import org.apache.wss4j.common.ConfigurationConstants;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.bean.Version;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.bean.Version;
+import org.apache.wss4j.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.token.SecurityTokenReference;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.dom.WSConstants;
diff --git 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java
 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java
index a4f4d5064..95e470595 100644
--- 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java
+++ 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java
@@ -31,8 +31,8 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.builder.SAML2Constants;
 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/SamlConditionsTest.java
 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java
index 3ac1c06e2..79414eef2 100644
--- 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java
+++ 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java
@@ -36,10 +36,10 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
 import net.shibboleth.shared.xml.DOMTypeSupport;
-import org.apache.wss4j.common.saml.bean.AudienceRestrictionBean;
-import org.apache.wss4j.common.saml.bean.ConditionsBean;
-import org.apache.wss4j.common.saml.bean.ProxyRestrictionBean;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.bean.AudienceRestrictionBean;
+import org.apache.wss4j.saml.bean.ConditionsBean;
+import org.apache.wss4j.saml.bean.ProxyRestrictionBean;
+import org.apache.wss4j.saml.builder.SAML1Constants;
 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 49acedf42..05eace6c3 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
@@ -31,10 +31,10 @@ import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
+import org.apache.wss4j.saml.SAMLCallback;
+import org.apache.wss4j.saml.SAMLUtil;
+import org.apache.wss4j.saml.SamlAssertionWrapper;
+import org.apache.wss4j.saml.builder.SAML1Constants;
 import org.apache.wss4j.common.token.SecurityTokenReference;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.dom.WSConstants;