(ws-wss4j) branch coheigea/saml-refactor-new updated: Renaming saml module to dom-saml

coheigea Thu, 10 Jul 2025 02:41:55 -0700

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

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



The following commit(s) were added to refs/heads/coheigea/saml-refactor-new by 
this push:
     new 1ac6326b0 Renaming saml module to dom-saml
1ac6326b0 is described below

commit 1ac6326b0a8247f572b7084a64b6613d681d30cd
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Thu Jul 10 10:40:49 2025 +0100

    Renaming saml module to dom-saml
---
 pom.xml                                            |  2 +-
 .../common/principal/SAMLTokenPrincipalImpl.java   |  2 +-
 {ws-security-saml => ws-security-dom-saml}/pom.xml |  4 +--
 .../org/apache/wss4j/dom}/saml/DOMSAMLUtil.java    |  3 +-
 .../apache/wss4j/dom}/saml/OpenSAMLBootstrap.java  |  2 +-
 .../org/apache/wss4j/dom}/saml/OpenSAMLUtil.java   |  2 +-
 .../org/apache/wss4j/dom}/saml/SAMLCallback.java   | 16 +++++-----
 .../java/org/apache/wss4j/dom}/saml/SAMLUtil.java  |  3 +-
 .../wss4j/dom}/saml/SamlAssertionWrapper.java      |  7 +++--
 .../dom}/saml/WSS4JXSBase64BinaryUnmarshaller.java |  2 +-
 .../dom}/saml/action/SAMLTokenSignedAction.java    | 10 +++----
 .../dom}/saml/action/SAMLTokenUnsignedAction.java  | 10 +++----
 .../apache/wss4j/dom}/saml/bean/ActionBean.java    |  2 +-
 .../apache/wss4j/dom}/saml/bean/AdviceBean.java    |  2 +-
 .../apache/wss4j/dom}/saml/bean/AttributeBean.java |  2 +-
 .../dom}/saml/bean/AttributeStatementBean.java     |  2 +-
 .../dom}/saml/bean/AudienceRestrictionBean.java    |  2 +-
 .../dom}/saml/bean/AuthDecisionStatementBean.java  |  2 +-
 .../saml/bean/AuthenticationStatementBean.java     |  2 +-
 .../wss4j/dom}/saml/bean/ConditionsBean.java       |  2 +-
 .../apache/wss4j/dom}/saml/bean/DelegateBean.java  |  2 +-
 .../apache/wss4j/dom}/saml/bean/KeyInfoBean.java   |  2 +-
 .../apache/wss4j/dom}/saml/bean/NameIDBean.java    |  2 +-
 .../wss4j/dom}/saml/bean/ProxyRestrictionBean.java |  2 +-
 .../apache/wss4j/dom}/saml/bean/SubjectBean.java   |  2 +-
 .../saml/bean/SubjectConfirmationDataBean.java     |  2 +-
 .../wss4j/dom}/saml/bean/SubjectLocalityBean.java  |  2 +-
 .../org/apache/wss4j/dom}/saml/bean/Version.java   |  2 +-
 .../dom}/saml/builder/SAML1ComponentBuilder.java   | 26 ++++++++---------
 .../wss4j/dom}/saml/builder/SAML1Constants.java    |  2 +-
 .../dom}/saml/builder/SAML2ComponentBuilder.java   | 34 +++++++++++-----------
 .../wss4j/dom}/saml/builder/SAML2Constants.java    |  2 +-
 .../dom}/saml/message/WSSSAMLKeyInfoProcessor.java |  6 ++--
 .../wss4j/dom}/saml/message/WSSecSAMLToken.java    |  4 +--
 .../dom}/saml/message/WSSecSignatureSAML.java      |  6 ++--
 .../dom}/saml/processor/SAMLTokenProcessor.java    |  8 ++---
 .../dom}/saml/validate/SamlAssertionValidator.java | 10 +++----
 .../org.apache.wss4j.api.dom.action.Action         |  2 ++
 .../org.apache.wss4j.api.dom.processor.Processor   |  1 +
 ....apache.wss4j.api.dom.saml.SAMLKeyInfoProcessor |  1 +
 .../org.apache.wss4j.api.dom.validate.Validator    |  1 +
 .../src/main/resources/saml2-xacml2-profile.xml    |  0
 .../src/main/resources/wss4j-signature-config.xml  |  2 +-
 .../apache/wss4j/dom}/saml/OpenSAMLUtilTest.java   |  2 +-
 .../dom}/saml/dom/AbstractSAMLCallbackHandler.java | 28 +++++++++---------
 .../apache/wss4j/dom}/saml/dom/CustomHandler.java  |  2 +-
 .../saml/dom/CustomSamlAssertionValidator.java     |  6 ++--
 .../wss4j/dom}/saml/dom/ModifiedRequestTest.java   | 12 ++++----
 .../apache/wss4j/dom}/saml/dom/PrincipalTest.java  | 10 +++----
 .../org/apache/wss4j/dom}/saml/dom/ReplayTest.java | 16 +++++-----
 .../wss4j/dom}/saml/dom/SAML1AuthnHOKHandler.java  | 14 ++++-----
 .../wss4j/dom}/saml/dom/SAML1CallbackHandler.java  | 14 ++++-----
 .../wss4j/dom}/saml/dom/SAML2CallbackHandler.java  | 14 ++++-----
 .../dom}/saml/dom/SAMLElementCallbackHandler.java  | 10 +++----
 .../dom}/saml/dom/SamlAlgorithmSuiteTest.java      | 12 ++++----
 .../apache/wss4j/dom}/saml/dom/SamlAuthnTest.java  | 10 +++----
 .../wss4j/dom}/saml/dom/SamlConditionsTest.java    | 22 +++++++-------
 .../wss4j/dom}/saml/dom/SamlNegativeTest.java      | 20 ++++++-------
 .../wss4j/dom}/saml/dom/SamlReferenceTest.java     | 14 ++++-----
 .../wss4j/dom}/saml/dom/SamlTokenActionTest.java   |  4 +--
 .../saml/dom/SamlTokenCustomSignatureTest.java     | 10 +++----
 .../wss4j/dom}/saml/dom/SamlTokenDerivedTest.java  | 10 +++----
 .../wss4j/dom}/saml/dom/SamlTokenHOKTest.java      | 14 ++++-----
 .../wss4j/dom}/saml/dom/SamlTokenSVTest.java       | 14 ++++-----
 .../apache/wss4j/dom}/saml/dom/SamlTokenTest.java  | 20 ++++++-------
 .../dom}/saml/dom/SignatureConfirmationTest.java   |  4 +--
 .../wss4j/dom}/saml/dom/SignaturePartsTest.java    | 12 ++++----
 .../dom}/saml/dom/SignedSamlTokenHOKTest.java      | 16 +++++-----
 .../apache/wss4j/dom}/saml/dom/ValidatorTest.java  |  8 ++---
 .../dom}/saml/dom/ext/AssertionSigningTest.java    | 12 ++++----
 .../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.api.dom.action.Action         |  2 --
 .../org.apache.wss4j.api.dom.processor.Processor   |  1 -
 ....apache.wss4j.api.dom.saml.SAMLKeyInfoProcessor |  1 -
 .../org.apache.wss4j.api.dom.validate.Validator    |  1 -
 ws-security-stax/pom.xml                           |  4 +--
 .../processor/input/SAMLTokenInputHandler.java     |  4 +--
 .../processor/output/SAMLTokenOutputProcessor.java | 12 ++++----
 .../impl/securityToken/SamlSecurityTokenImpl.java  |  6 ++--
 .../stax/securityEvent/SamlTokenSecurityEvent.java |  2 +-
 .../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/ReplayTest.java     |  4 +--
 .../wss4j/stax/test/saml/CustomContentsTest.java   | 10 +++----
 .../wss4j/stax/test/saml/SAML1CallbackHandler.java |  6 ++--
 .../wss4j/stax/test/saml/SAML2CallbackHandler.java |  6 ++--
 .../stax/test/saml/SAMLCallbackHandlerImpl.java    | 30 +++++++++----------
 .../wss4j/stax/test/saml/SAMLTokenHOKTest.java     | 16 +++++-----
 .../stax/test/saml/SAMLTokenNegativeTest.java      |  4 +--
 .../stax/test/saml/SAMLTokenReferenceTest.java     | 14 ++++-----
 .../wss4j/stax/test/saml/SAMLTokenSVTest.java      |  6 ++--
 .../apache/wss4j/stax/test/saml/SAMLTokenTest.java | 14 ++++-----
 .../apache/wss4j/stax/test/saml/SamlAuthnTest.java |  4 +--
 .../wss4j/stax/test/saml/SamlConditionsTest.java   |  8 ++---
 .../wss4j/stax/test/saml/SamlTokenDerivedTest.java |  8 ++---
 104 files changed, 379 insertions(+), 376 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7d6a3dc1f..35f253974 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
         <module>policy</module>
         <module>ws-security-common</module>
         <module>ws-security-api-dom</module>
-        <module>ws-security-saml</module>
+        <module>ws-security-dom-saml</module>
         <module>ws-security-dom</module>
         <module>ws-security-stax</module>
         <module>ws-security-web</module>
diff --git 
a/ws-security-common/src/main/java/org/apache/wss4j/common/principal/SAMLTokenPrincipalImpl.java
 
b/ws-security-common/src/main/java/org/apache/wss4j/common/principal/SAMLTokenPrincipalImpl.java
index 1643827e8..44c600df7 100644
--- 
a/ws-security-common/src/main/java/org/apache/wss4j/common/principal/SAMLTokenPrincipalImpl.java
+++ 
b/ws-security-common/src/main/java/org/apache/wss4j/common/principal/SAMLTokenPrincipalImpl.java
@@ -43,7 +43,7 @@ public class SAMLTokenPrincipalImpl implements Serializable, 
SAMLTokenPrincipal
 
         // Use reflection to extract the subject name from the SAML assertion
         try {
-            Class<?> samlAssertionWrapperClass = 
Class.forName("org.apache.wss4j.common.saml.SamlAssertionWrapper");
+            Class<?> samlAssertionWrapperClass = 
Class.forName("org.apache.wss4j.dom.saml.SamlAssertionWrapper");
             if (samlAssertionWrapperClass.isInstance(samlAssertion)) {
                 Object samlWrapper = 
samlAssertionWrapperClass.cast(samlAssertion);
                 this.name = (String) 
samlAssertionWrapperClass.getMethod("getSubjectName").invoke(samlWrapper);
diff --git a/ws-security-saml/pom.xml b/ws-security-dom-saml/pom.xml
similarity index 98%
rename from ws-security-saml/pom.xml
rename to ws-security-dom-saml/pom.xml
index 3bde1c070..f7044f222 100644
--- a/ws-security-saml/pom.xml
+++ b/ws-security-dom-saml/pom.xml
@@ -25,8 +25,8 @@
         <relativePath>../parent/pom.xml</relativePath>
         <version>4.0.1-SNAPSHOT</version>
     </parent>
-    <artifactId>wss4j-ws-security-saml</artifactId>
-    <name>Apache WSS4J WS-Security SAML</name>
+    <artifactId>wss4j-ws-security-dom-saml</artifactId>
+    <name>Apache WSS4J WS-Security SAML DOM implementation</name>
     
     <properties>
         <wss4j.osgi.import>
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/DOMSAMLUtil.java 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/DOMSAMLUtil.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java
index 529f850f9..ba7d1f5c6 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/DOMSAMLUtil.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.dom.saml;
 
 import java.security.MessageDigest;
 import java.security.Principal;
@@ -30,6 +30,7 @@ import java.util.Map;
 
 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.api.dom.WSConstants;
 import org.apache.wss4j.api.dom.WSDataRef;
 import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/OpenSAMLBootstrap.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/OpenSAMLBootstrap.java
index f3858401c..e0683b943 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/OpenSAMLBootstrap.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.dom.saml;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/OpenSAMLUtil.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/OpenSAMLUtil.java
index 4fca170bd..b03a75777 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/OpenSAMLUtil.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.dom.saml;
 
 import javax.xml.namespace.QName;
 
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SAMLCallback.java 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/SAMLCallback.java
similarity index 96%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SAMLCallback.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/SAMLCallback.java
index b567ce915..daa8225e4 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SAMLCallback.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/SAMLCallback.java
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.dom.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.dom.saml.bean.AdviceBean;
+import org.apache.wss4j.dom.saml.bean.AttributeStatementBean;
+import org.apache.wss4j.dom.saml.bean.AuthDecisionStatementBean;
+import org.apache.wss4j.dom.saml.bean.AuthenticationStatementBean;
+import org.apache.wss4j.dom.saml.bean.ConditionsBean;
+import org.apache.wss4j.dom.saml.bean.SubjectBean;
+import org.apache.wss4j.dom.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/common/saml/SAMLUtil.java 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/SAMLUtil.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/SAMLUtil.java
index d9d18fa60..ae9b6e412 100644
--- a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java
+++ b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/SAMLUtil.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.dom.saml;
 
 import java.io.IOException;
 import java.security.NoSuchProviderException;
@@ -40,6 +40,7 @@ import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.api.dom.saml.SAMLKeyInfoProcessor;
 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.util.XMLUtils;
 import org.opensaml.saml.saml2.core.SubjectConfirmationData;
 import org.w3c.dom.Element;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/SamlAssertionWrapper.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/SamlAssertionWrapper.java
index 75511c70b..555181175 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/SamlAssertionWrapper.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.dom.saml;
 
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
@@ -30,8 +30,9 @@ import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.api.dom.saml.SAMLKeyInfoProcessor;
 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.common.saml.SAMLKeyInfo;
+import org.apache.wss4j.dom.saml.builder.SAML1ComponentBuilder;
+import org.apache.wss4j.dom.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/common/saml/WSS4JXSBase64BinaryUnmarshaller.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/WSS4JXSBase64BinaryUnmarshaller.java
similarity index 98%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/WSS4JXSBase64BinaryUnmarshaller.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/WSS4JXSBase64BinaryUnmarshaller.java
index 9c7e550ae..e7af2d97e 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/WSS4JXSBase64BinaryUnmarshaller.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/WSS4JXSBase64BinaryUnmarshaller.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.dom.saml;
 
 import net.shibboleth.shared.primitive.StringSupport;
 import org.opensaml.core.xml.XMLObject;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/action/SAMLTokenSignedAction.java
similarity index 95%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/action/SAMLTokenSignedAction.java
index c54d6361c..2729057d6 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenSignedAction.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/action/SAMLTokenSignedAction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.action;
+package org.apache.wss4j.dom.saml.action;
 
 import javax.security.auth.callback.CallbackHandler;
 
@@ -25,13 +25,13 @@ import org.apache.wss4j.api.dom.action.SecurityActionToken;
 import org.apache.wss4j.api.dom.action.SignatureActionToken;
 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.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
 import org.apache.wss4j.api.dom.WSConstants;
 import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.api.dom.action.Action;
-import org.apache.wss4j.common.saml.message.WSSecSignatureSAML;
+import org.apache.wss4j.dom.saml.message.WSSecSignatureSAML;
 import org.apache.wss4j.api.dom.action.ActionUtils;
 
 public class SAMLTokenSignedAction implements Action {
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenUnsignedAction.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/action/SAMLTokenUnsignedAction.java
similarity index 91%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenUnsignedAction.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/action/SAMLTokenUnsignedAction.java
index c74faf8cf..aa19b0f34 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/action/SAMLTokenUnsignedAction.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/action/SAMLTokenUnsignedAction.java
@@ -17,19 +17,19 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.action;
+package org.apache.wss4j.dom.saml.action;
 
 import javax.security.auth.callback.CallbackHandler;
 
 import org.apache.wss4j.api.dom.action.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.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
 import org.apache.wss4j.api.dom.WSConstants;
 import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.api.dom.action.Action;
-import org.apache.wss4j.common.saml.message.WSSecSAMLToken;
+import org.apache.wss4j.dom.saml.message.WSSecSAMLToken;
 
 public class SAMLTokenUnsignedAction implements Action {
 
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/ActionBean.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/ActionBean.java
similarity index 98%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/ActionBean.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/ActionBean.java
index bc31163d3..b7e14353e 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/ActionBean.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/ActionBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.saml.bean;
 
 
 /**
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AdviceBean.java
similarity index 98%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AdviceBean.java
index 5d10eec7a..02a1dd638 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AdviceBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.saml.bean;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AttributeBean.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AttributeBean.java
index 3b1aa4c49..0e4482efb 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AttributeBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.saml.bean;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AttributeStatementBean.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AttributeStatementBean.java
similarity index 98%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AttributeStatementBean.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AttributeStatementBean.java
index 486840c11..a76256bae 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AttributeStatementBean.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AttributeStatementBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.saml.bean;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AudienceRestrictionBean.java
similarity index 98%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AudienceRestrictionBean.java
index 0bf0e1ede..c4f8f95cd 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AudienceRestrictionBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.saml.bean;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AuthDecisionStatementBean.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AuthDecisionStatementBean.java
index 62326d2a3..94204fe5b 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AuthDecisionStatementBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.saml.bean;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AuthenticationStatementBean.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AuthenticationStatementBean.java
index dfff5458e..488dea206 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/AuthenticationStatementBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.saml.bean;
 
 import java.time.Instant;
 
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/ConditionsBean.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/ConditionsBean.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/ConditionsBean.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/ConditionsBean.java
index 139ed2fcf..6f05c4538 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/ConditionsBean.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/ConditionsBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.saml.bean;
 
 import java.time.Instant;
 import java.util.Date;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/DelegateBean.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/DelegateBean.java
similarity index 98%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/DelegateBean.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/DelegateBean.java
index c324ef1db..8e2824369 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/DelegateBean.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/DelegateBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.saml.bean;
 
 import java.time.Instant;
 import java.util.Date;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/KeyInfoBean.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/KeyInfoBean.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/KeyInfoBean.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/KeyInfoBean.java
index 3d6ef6bce..0151957b5 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/KeyInfoBean.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/KeyInfoBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.saml.bean;
 
 import java.security.PublicKey;
 import java.security.cert.X509Certificate;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/NameIDBean.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/NameIDBean.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/NameIDBean.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/NameIDBean.java
index db91e3294..33cd8687a 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/NameIDBean.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/NameIDBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.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/common/saml/bean/ProxyRestrictionBean.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/ProxyRestrictionBean.java
similarity index 98%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/ProxyRestrictionBean.java
index 7546817c2..d46e920c3 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/ProxyRestrictionBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.saml.bean;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/SubjectBean.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/SubjectBean.java
index 067daf87a..0c34e712f 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/SubjectBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.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/common/saml/bean/SubjectConfirmationDataBean.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/SubjectConfirmationDataBean.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/SubjectConfirmationDataBean.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/SubjectConfirmationDataBean.java
index 746a6343c..372347704 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/SubjectConfirmationDataBean.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/SubjectConfirmationDataBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.saml.bean;
 
 import java.time.Instant;
 import java.util.ArrayList;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/SubjectLocalityBean.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/SubjectLocalityBean.java
similarity index 98%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/SubjectLocalityBean.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/SubjectLocalityBean.java
index f02e2cfac..fcc08c6eb 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/SubjectLocalityBean.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/SubjectLocalityBean.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.saml.bean;
 
 /**
  * This class represents a SubjectLocality.
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/Version.java 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/Version.java
similarity index 95%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/Version.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/Version.java
index 66e9d6c0f..66a6d3481 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/Version.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/bean/Version.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.bean;
+package org.apache.wss4j.dom.saml.bean;
 
 
 /**
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/builder/SAML1ComponentBuilder.java
similarity index 97%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/builder/SAML1ComponentBuilder.java
index 44f24ff9e..f44d78c39 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/builder/SAML1ComponentBuilder.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.builder;
+package org.apache.wss4j.dom.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.dom.saml.OpenSAMLUtil;
+import org.apache.wss4j.dom.saml.bean.ActionBean;
+import org.apache.wss4j.dom.saml.bean.AdviceBean;
+import org.apache.wss4j.dom.saml.bean.AttributeBean;
+import org.apache.wss4j.dom.saml.bean.AttributeStatementBean;
+import org.apache.wss4j.dom.saml.bean.AudienceRestrictionBean;
+import org.apache.wss4j.dom.saml.bean.AuthDecisionStatementBean;
+import org.apache.wss4j.dom.saml.bean.AuthenticationStatementBean;
+import org.apache.wss4j.dom.saml.bean.ConditionsBean;
+import org.apache.wss4j.dom.saml.bean.KeyInfoBean;
+import org.apache.wss4j.dom.saml.bean.SubjectBean;
+import org.apache.wss4j.dom.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/common/saml/builder/SAML1Constants.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/builder/SAML1Constants.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML1Constants.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/builder/SAML1Constants.java
index 67c0bdd41..ab3a1f43e 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML1Constants.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/builder/SAML1Constants.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.builder;
+package org.apache.wss4j.dom.saml.builder;
 
 
 /**
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/builder/SAML2ComponentBuilder.java
similarity index 97%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/builder/SAML2ComponentBuilder.java
index bff03d14d..5271c24be 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/builder/SAML2ComponentBuilder.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.builder;
+package org.apache.wss4j.dom.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.dom.saml.OpenSAMLUtil;
+import org.apache.wss4j.dom.saml.bean.ActionBean;
+import org.apache.wss4j.dom.saml.bean.AdviceBean;
+import org.apache.wss4j.dom.saml.bean.AttributeBean;
+import org.apache.wss4j.dom.saml.bean.AttributeStatementBean;
+import org.apache.wss4j.dom.saml.bean.AudienceRestrictionBean;
+import org.apache.wss4j.dom.saml.bean.AuthDecisionStatementBean;
+import org.apache.wss4j.dom.saml.bean.AuthenticationStatementBean;
+import org.apache.wss4j.dom.saml.bean.ConditionsBean;
+import org.apache.wss4j.dom.saml.bean.DelegateBean;
+import org.apache.wss4j.dom.saml.bean.KeyInfoBean;
+import org.apache.wss4j.dom.saml.bean.NameIDBean;
+import org.apache.wss4j.dom.saml.bean.ProxyRestrictionBean;
+import org.apache.wss4j.dom.saml.bean.SubjectBean;
+import org.apache.wss4j.dom.saml.bean.SubjectConfirmationDataBean;
+import org.apache.wss4j.dom.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/common/saml/builder/SAML2Constants.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/builder/SAML2Constants.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML2Constants.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/builder/SAML2Constants.java
index 5426f113a..92c7094df 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML2Constants.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/builder/SAML2Constants.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.builder;
+package org.apache.wss4j.dom.saml.builder;
 
 
 /**
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSSAMLKeyInfoProcessor.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/message/WSSSAMLKeyInfoProcessor.java
similarity index 98%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSSAMLKeyInfoProcessor.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/message/WSSSAMLKeyInfoProcessor.java
index 123bed3ad..cccf2b465 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSSAMLKeyInfoProcessor.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/message/WSSSAMLKeyInfoProcessor.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.message;
+package org.apache.wss4j.dom.saml.message;
 
 import java.util.List;
 
@@ -31,8 +31,8 @@ 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.api.dom.saml.SAMLKeyInfoProcessor;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.api.dom.token.SecurityTokenReference;
 import org.apache.wss4j.api.dom.WSConstants;
 import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSAMLToken.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/message/WSSecSAMLToken.java
similarity index 97%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSAMLToken.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/message/WSSecSAMLToken.java
index cdfe4b20a..e15ef95c3 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSAMLToken.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/message/WSSecSAMLToken.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.message;
+package org.apache.wss4j.dom.saml.message;
 
 import org.apache.wss4j.api.dom.message.WSSecBase;
 import org.apache.wss4j.api.dom.message.WSSecHeader;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.common.ext.WSSecurityException;
 
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/message/WSSecSignatureSAML.java
similarity index 99%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/message/WSSecSignatureSAML.java
index f56cc2cb2..94bf0d735 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSignatureSAML.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/message/WSSecSignatureSAML.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.message;
+package org.apache.wss4j.dom.saml.message;
 
 import java.security.PublicKey;
 import java.security.cert.X509Certificate;
@@ -35,10 +35,10 @@ import org.apache.wss4j.api.dom.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.dom.saml.OpenSAMLUtil;
 import org.apache.wss4j.common.saml.SAMLKeyInfo;
 import org.apache.wss4j.api.dom.saml.SAMLKeyInfoProcessor;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.api.dom.token.BinarySecurity;
 import org.apache.wss4j.api.dom.token.DOMX509Data;
 import org.apache.wss4j.api.dom.token.DOMX509IssuerSerial;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/processor/SAMLTokenProcessor.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/processor/SAMLTokenProcessor.java
similarity index 98%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/processor/SAMLTokenProcessor.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/processor/SAMLTokenProcessor.java
index b4253cfde..fdc409bc0 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/processor/SAMLTokenProcessor.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/processor/SAMLTokenProcessor.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.processor;
+package org.apache.wss4j.dom.saml.processor;
 
 import java.security.NoSuchProviderException;
 import java.security.Provider;
@@ -40,8 +40,8 @@ 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.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.DOM2Writer;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.api.dom.WSConstants;
@@ -49,7 +49,7 @@ import org.apache.wss4j.api.dom.WSDataRef;
 import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
 import org.apache.wss4j.api.dom.processor.Processor;
 import org.apache.wss4j.api.dom.RequestData;
-import org.apache.wss4j.common.saml.message.WSSSAMLKeyInfoProcessor;
+import org.apache.wss4j.dom.saml.message.WSSSAMLKeyInfoProcessor;
 import org.apache.wss4j.api.dom.validate.Credential;
 import org.apache.wss4j.api.dom.validate.Validator;
 import org.opensaml.xmlsec.signature.KeyInfo;
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/validate/SamlAssertionValidator.java
 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/validate/SamlAssertionValidator.java
similarity index 98%
rename from 
ws-security-saml/src/main/java/org/apache/wss4j/common/saml/validate/SamlAssertionValidator.java
rename to 
ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/validate/SamlAssertionValidator.java
index 2d854f9c7..1495ecbc9 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/validate/SamlAssertionValidator.java
+++ 
b/ws-security-dom-saml/src/main/java/org/apache/wss4j/dom/saml/validate/SamlAssertionValidator.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.validate;
+package org.apache.wss4j.dom.saml.validate;
 
 import java.time.Instant;
 import java.util.List;
@@ -28,11 +28,11 @@ import org.apache.wss4j.common.cache.ReplayCache;
 import org.apache.wss4j.api.dom.validate.Credential;
 import org.apache.wss4j.api.dom.validate.Validator;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.OpenSAMLUtil;
+import org.apache.wss4j.dom.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.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
 import org.apache.wss4j.api.dom.WSConstants;
 import org.apache.wss4j.api.dom.RequestData;
 import org.opensaml.saml.common.SAMLVersion;
diff --git 
a/ws-security-dom-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.action.Action
 
b/ws-security-dom-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.action.Action
new file mode 100644
index 000000000..f9cca2bce
--- /dev/null
+++ 
b/ws-security-dom-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.action.Action
@@ -0,0 +1,2 @@
+org.apache.wss4j.dom.saml.action.SAMLTokenUnsignedAction
+org.apache.wss4j.dom.saml.action.SAMLTokenSignedAction
diff --git 
a/ws-security-dom-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.processor.Processor
 
b/ws-security-dom-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.processor.Processor
new file mode 100644
index 000000000..c74229fdd
--- /dev/null
+++ 
b/ws-security-dom-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.processor.Processor
@@ -0,0 +1 @@
+org.apache.wss4j.dom.saml.processor.SAMLTokenProcessor
diff --git 
a/ws-security-dom-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.saml.SAMLKeyInfoProcessor
 
b/ws-security-dom-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.saml.SAMLKeyInfoProcessor
new file mode 100644
index 000000000..9ff9262f5
--- /dev/null
+++ 
b/ws-security-dom-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.saml.SAMLKeyInfoProcessor
@@ -0,0 +1 @@
+org.apache.wss4j.dom.saml.message.WSSSAMLKeyInfoProcessor
diff --git 
a/ws-security-dom-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.validate.Validator
 
b/ws-security-dom-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.validate.Validator
new file mode 100644
index 000000000..e6927a5cd
--- /dev/null
+++ 
b/ws-security-dom-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.validate.Validator
@@ -0,0 +1 @@
+org.apache.wss4j.dom.saml.validate.SamlAssertionValidator
diff --git a/ws-security-saml/src/main/resources/saml2-xacml2-profile.xml 
b/ws-security-dom-saml/src/main/resources/saml2-xacml2-profile.xml
similarity index 100%
rename from ws-security-saml/src/main/resources/saml2-xacml2-profile.xml
rename to ws-security-dom-saml/src/main/resources/saml2-xacml2-profile.xml
diff --git a/ws-security-common/src/main/resources/wss4j-signature-config.xml 
b/ws-security-dom-saml/src/main/resources/wss4j-signature-config.xml
similarity index 85%
rename from ws-security-common/src/main/resources/wss4j-signature-config.xml
rename to ws-security-dom-saml/src/main/resources/wss4j-signature-config.xml
index 07ee51572..7b57a48f1 100644
--- a/ws-security-common/src/main/resources/wss4j-signature-config.xml
+++ b/ws-security-dom-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.dom.saml.WSS4JXSBase64BinaryUnmarshaller"/>
         </ObjectProvider>
 
     </ObjectProviders>
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/OpenSAMLUtilTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/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-dom-saml/src/test/java/org/apache/wss4j/dom/saml/OpenSAMLUtilTest.java
index 8cc20b258..d328ded22 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/OpenSAMLUtilTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/OpenSAMLUtilTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml;
+package org.apache.wss4j.dom.saml;
 
 import org.junit.jupiter.api.Test;
 
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/AbstractSAMLCallbackHandler.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/AbstractSAMLCallbackHandler.java
similarity index 92%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/AbstractSAMLCallbackHandler.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/AbstractSAMLCallbackHandler.java
index 56f5609a8..60750519e 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/AbstractSAMLCallbackHandler.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/AbstractSAMLCallbackHandler.java
@@ -17,24 +17,24 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import org.apache.wss4j.api.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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.bean.ActionBean;
+import org.apache.wss4j.dom.saml.bean.AttributeBean;
+import org.apache.wss4j.dom.saml.bean.AttributeStatementBean;
+import org.apache.wss4j.dom.saml.bean.AuthDecisionStatementBean;
+import org.apache.wss4j.dom.saml.bean.AuthenticationStatementBean;
+import org.apache.wss4j.dom.saml.bean.ConditionsBean;
+import org.apache.wss4j.dom.saml.bean.KeyInfoBean;
+import org.apache.wss4j.dom.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.dom.saml.bean.NameIDBean;
+import org.apache.wss4j.dom.saml.bean.SubjectBean;
+import org.apache.wss4j.dom.saml.bean.SubjectConfirmationDataBean;
+import org.apache.wss4j.dom.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-saml/src/test/java/org/apache/wss4j/common/saml/dom/CustomHandler.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/CustomHandler.java
similarity index 98%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/CustomHandler.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/CustomHandler.java
index ab962f013..78ed780b2 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/CustomHandler.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/CustomHandler.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/CustomSamlAssertionValidator.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/CustomSamlAssertionValidator.java
similarity index 95%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/CustomSamlAssertionValidator.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/CustomSamlAssertionValidator.java
index fb1927ab4..39300163e 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/CustomSamlAssertionValidator.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/CustomSamlAssertionValidator.java
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.api.dom.validate.Credential;
-import org.apache.wss4j.common.saml.validate.SamlAssertionValidator;
+import org.apache.wss4j.dom.saml.validate.SamlAssertionValidator;
 
 public class CustomSamlAssertionValidator extends SamlAssertionValidator {
 
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ModifiedRequestTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ModifiedRequestTest.java
similarity index 93%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ModifiedRequestTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ModifiedRequestTest.java
index 47b5e616f..dd1502396 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ModifiedRequestTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ModifiedRequestTest.java
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import javax.security.auth.callback.CallbackHandler;
 
 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.api.dom.WSConstants;
@@ -37,7 +37,7 @@ import org.apache.wss4j.api.dom.engine.WSSConfig;
 import org.apache.wss4j.dom.engine.WSSecurityEngine;
 import org.apache.wss4j.api.dom.message.WSSecHeader;
 import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.apache.wss4j.common.saml.message.WSSecSignatureSAML;
+import org.apache.wss4j.dom.saml.message.WSSecSignatureSAML;
 
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/PrincipalTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/PrincipalTest.java
similarity index 98%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/PrincipalTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/PrincipalTest.java
index 206a67f99..15674c8e1 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/PrincipalTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/PrincipalTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import java.security.Principal;
 import java.security.cert.X509Certificate;
@@ -30,9 +30,9 @@ 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.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.api.dom.token.BinarySecurity;
 import org.apache.wss4j.api.dom.token.X509Security;
 import org.apache.wss4j.common.util.SOAPUtil;
@@ -45,7 +45,7 @@ import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
 import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.api.dom.message.WSSecHeader;
-import org.apache.wss4j.common.saml.message.WSSecSAMLToken;
+import org.apache.wss4j.dom.saml.message.WSSecSAMLToken;
 import org.apache.wss4j.dom.message.WSSecUsernameToken;
 import org.apache.wss4j.api.dom.validate.Credential;
 import org.apache.wss4j.api.dom.validate.Validator;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ReplayTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ReplayTest.java
similarity index 94%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ReplayTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ReplayTest.java
index ee9a4f690..199cc4f68 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ReplayTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ReplayTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import java.nio.file.Path;
 
@@ -32,17 +32,17 @@ import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.api.dom.message.WSSecHeader;
 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.common.saml.message.WSSecSAMLToken;
+import org.apache.wss4j.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.bean.ConditionsBean;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
+import org.apache.wss4j.dom.saml.message.WSSecSAMLToken;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.apache.wss4j.common.saml.validate.SamlAssertionValidator;
+import org.apache.wss4j.dom.saml.validate.SamlAssertionValidator;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SAML1AuthnHOKHandler.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML1AuthnHOKHandler.java
similarity index 88%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SAML1AuthnHOKHandler.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML1AuthnHOKHandler.java
index a0b4e06d2..e22b2eeba 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SAML1AuthnHOKHandler.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML1AuthnHOKHandler.java
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.bean.AuthenticationStatementBean;
+import org.apache.wss4j.dom.saml.bean.KeyInfoBean;
+import org.apache.wss4j.dom.saml.bean.SubjectBean;
+import org.apache.wss4j.dom.saml.bean.Version;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SAML1CallbackHandler.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML1CallbackHandler.java
similarity index 91%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SAML1CallbackHandler.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML1CallbackHandler.java
index 643984067..0c1898160 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SAML1CallbackHandler.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML1CallbackHandler.java
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.bean.AdviceBean;
+import org.apache.wss4j.dom.saml.bean.KeyInfoBean;
+import org.apache.wss4j.dom.saml.bean.SubjectBean;
+import org.apache.wss4j.dom.saml.bean.Version;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.UnsupportedCallbackException;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SAML2CallbackHandler.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML2CallbackHandler.java
similarity index 92%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SAML2CallbackHandler.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML2CallbackHandler.java
index 94ff052b7..bde9d596d 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SAML2CallbackHandler.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML2CallbackHandler.java
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.bean.AdviceBean;
+import org.apache.wss4j.dom.saml.bean.KeyInfoBean;
+import org.apache.wss4j.dom.saml.bean.SubjectBean;
+import org.apache.wss4j.dom.saml.bean.Version;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.UnsupportedCallbackException;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SAMLElementCallbackHandler.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAMLElementCallbackHandler.java
similarity index 92%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SAMLElementCallbackHandler.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAMLElementCallbackHandler.java
index e9e243ae2..38d2fab59 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SAMLElementCallbackHandler.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAMLElementCallbackHandler.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import java.io.IOException;
 
@@ -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.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
 import org.w3c.dom.Element;
 
 /**
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlAlgorithmSuiteTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlAlgorithmSuiteTest.java
similarity index 97%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlAlgorithmSuiteTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlAlgorithmSuiteTest.java
index 55293219f..83dec1643 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlAlgorithmSuiteTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlAlgorithmSuiteTest.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import javax.xml.crypto.dsig.CanonicalizationMethod;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -35,10 +35,10 @@ import org.apache.wss4j.dom.engine.WSSecurityEngine;
 import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.api.dom.message.WSSecHeader;
-import org.apache.wss4j.common.saml.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.dom.saml.message.WSSecSAMLToken;
+import org.apache.wss4j.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.util.WSSecurityUtil;
 
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlAuthnTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlAuthnTest.java
similarity index 96%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlAuthnTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlAuthnTest.java
index 1bc431377..bd1f6adce 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlAuthnTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlAuthnTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.api.dom.WSConstants;
@@ -37,7 +37,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngine;
 import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.api.dom.message.WSSecHeader;
-import org.apache.wss4j.common.saml.message.WSSecSAMLToken;
+import org.apache.wss4j.dom.saml.message.WSSecSAMLToken;
 
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlConditionsTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlConditionsTest.java
similarity index 98%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlConditionsTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlConditionsTest.java
index ab382a35c..a3a5603ff 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlConditionsTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlConditionsTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.bean.AudienceRestrictionBean;
+import org.apache.wss4j.dom.saml.bean.ConditionsBean;
+import org.apache.wss4j.dom.saml.bean.DelegateBean;
+import org.apache.wss4j.dom.saml.bean.NameIDBean;
+import org.apache.wss4j.dom.saml.bean.ProxyRestrictionBean;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.api.dom.WSConstants;
@@ -46,7 +46,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngine;
 import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.api.dom.message.WSSecHeader;
-import org.apache.wss4j.common.saml.message.WSSecSAMLToken;
+import org.apache.wss4j.dom.saml.message.WSSecSAMLToken;
 
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlNegativeTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlNegativeTest.java
similarity index 97%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlNegativeTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlNegativeTest.java
index 368db19b4..8b27b4056 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlNegativeTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlNegativeTest.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.api.dom.WSConstants;
 import org.apache.wss4j.common.crypto.KeystoreCallbackHandler;
@@ -33,17 +33,17 @@ 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.bean.SubjectBean;
+import org.apache.wss4j.dom.saml.bean.Version;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.Loader;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.api.dom.message.WSSecHeader;
-import org.apache.wss4j.common.saml.message.WSSecSAMLToken;
-import org.apache.wss4j.common.saml.message.WSSecSignatureSAML;
+import org.apache.wss4j.dom.saml.message.WSSecSAMLToken;
+import org.apache.wss4j.dom.saml.message.WSSecSignatureSAML;
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlReferenceTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlReferenceTest.java
similarity index 99%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlReferenceTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlReferenceTest.java
index af5065496..4af984aa7 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlReferenceTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlReferenceTest.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import org.apache.wss4j.api.dom.WSEncryptionPart;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.api.dom.WSConstants;
 import org.apache.wss4j.api.dom.WSDataRef;
@@ -34,11 +34,11 @@ 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.common.saml.message.WSSecSignatureSAML;
+import org.apache.wss4j.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
+import org.apache.wss4j.dom.saml.message.WSSecSignatureSAML;
 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-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenActionTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenActionTest.java
similarity index 99%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenActionTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenActionTest.java
index dfd05e9ec..5308cffa5 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenActionTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenActionTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -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.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.api.dom.WSConstants;
 import org.apache.wss4j.common.crypto.KeystoreCallbackHandler;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenCustomSignatureTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenCustomSignatureTest.java
similarity index 96%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenCustomSignatureTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenCustomSignatureTest.java
index 45907c010..f293aa865 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenCustomSignatureTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenCustomSignatureTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,10 +27,10 @@ import java.util.TreeMap;
 import org.apache.wss4j.api.dom.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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.api.dom.WSConstants;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenDerivedTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenDerivedTest.java
similarity index 97%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenDerivedTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenDerivedTest.java
index d0d58c8c5..8e8d1d3e3 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenDerivedTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenDerivedTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import java.security.cert.X509Certificate;
 import java.util.List;
@@ -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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
 import org.apache.wss4j.api.dom.token.SecurityTokenReference;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.common.util.XMLUtils;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenHOKTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenHOKTest.java
similarity index 96%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenHOKTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenHOKTest.java
index 0b0854a52..a4dab9921 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenHOKTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenHOKTest.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.api.dom.WSConstants;
 import org.apache.wss4j.common.crypto.KeystoreCallbackHandler;
@@ -31,13 +31,13 @@ import org.apache.wss4j.api.dom.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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.api.dom.message.WSSecHeader;
-import org.apache.wss4j.common.saml.message.WSSecSAMLToken;
+import org.apache.wss4j.dom.saml.message.WSSecSAMLToken;
 
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenSVTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenSVTest.java
similarity index 97%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenSVTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenSVTest.java
index 7428afece..a02d66751 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenSVTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenSVTest.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.api.dom.WSConstants;
 import org.apache.wss4j.api.dom.WSDataRef;
@@ -30,11 +30,11 @@ import org.apache.wss4j.dom.engine.WSSecurityEngine;
 import org.apache.wss4j.api.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.common.saml.message.WSSecSignatureSAML;
+import org.apache.wss4j.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
+import org.apache.wss4j.dom.saml.message.WSSecSignatureSAML;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenTest.java
similarity index 99%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenTest.java
index 77315175f..c4b463137 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SamlTokenTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.bean.NameIDBean;
+import org.apache.wss4j.dom.saml.bean.SubjectConfirmationDataBean;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
 import org.apache.wss4j.api.dom.token.SecurityTokenReference;
 import org.apache.wss4j.common.util.DOM2Writer;
 import org.apache.wss4j.common.util.SOAPUtil;
@@ -62,8 +62,8 @@ import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
 import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.api.dom.message.WSSecHeader;
-import org.apache.wss4j.common.saml.message.WSSecSAMLToken;
-import org.apache.wss4j.common.saml.validate.SamlAssertionValidator;
+import org.apache.wss4j.dom.saml.message.WSSecSAMLToken;
+import org.apache.wss4j.dom.saml.validate.SamlAssertionValidator;
 import org.apache.xml.security.encryption.EncryptedData;
 import org.apache.xml.security.encryption.EncryptedKey;
 import org.apache.xml.security.encryption.Reference;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignatureConfirmationTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignatureConfirmationTest.java
similarity index 98%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignatureConfirmationTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignatureConfirmationTest.java
index c1f5abc8e..a2f7b2ca9 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignatureConfirmationTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignatureConfirmationTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import java.util.*;
 
@@ -25,7 +25,7 @@ import javax.security.auth.callback.CallbackHandler;
 
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.api.dom.WSConstants;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignaturePartsTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignaturePartsTest.java
similarity index 95%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignaturePartsTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignaturePartsTest.java
index 2ac30256c..fab9a6f01 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignaturePartsTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignaturePartsTest.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import org.apache.wss4j.api.dom.WSEncryptionPart;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.api.dom.WSDataRef;
 import org.apache.wss4j.api.dom.WSConstants;
@@ -33,12 +33,12 @@ 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
 import org.apache.wss4j.common.util.Loader;
 import org.apache.wss4j.common.util.XMLUtils;
-import org.apache.wss4j.common.saml.message.WSSecSignatureSAML;
+import org.apache.wss4j.dom.saml.message.WSSecSignatureSAML;
 
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignedSamlTokenHOKTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignedSamlTokenHOKTest.java
similarity index 98%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignedSamlTokenHOKTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignedSamlTokenHOKTest.java
index 1154051d2..88ed15739 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignedSamlTokenHOKTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignedSamlTokenHOKTest.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.api.dom.WSConstants;
 import org.apache.wss4j.api.dom.WSDataRef;
@@ -35,12 +35,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.bean.KeyInfoBean.CERT_IDENTIFIER;
-import org.apache.wss4j.common.saml.builder.SAML1Constants;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
-import org.apache.wss4j.common.saml.message.WSSecSignatureSAML;
+import org.apache.wss4j.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.bean.KeyInfoBean.CERT_IDENTIFIER;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
+import org.apache.wss4j.dom.saml.message.WSSecSignatureSAML;
 import org.apache.wss4j.common.util.Loader;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.api.dom.message.WSSecHeader;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ValidatorTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ValidatorTest.java
similarity index 97%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ValidatorTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ValidatorTest.java
index 0687d39fa..e3bc845fc 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ValidatorTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ValidatorTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom;
+package org.apache.wss4j.dom.saml.dom;
 
 import java.security.cert.X509Certificate;
 import java.util.List;
@@ -28,9 +28,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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.api.dom.token.BinarySecurity;
 import org.apache.wss4j.api.dom.token.X509Security;
 import org.apache.wss4j.common.util.SOAPUtil;
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ext/AssertionSigningTest.java
 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ext/AssertionSigningTest.java
similarity index 95%
rename from 
ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ext/AssertionSigningTest.java
rename to 
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ext/AssertionSigningTest.java
index 66a17bbc6..28d2b0c3f 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ext/AssertionSigningTest.java
+++ 
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ext/AssertionSigningTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wss4j.common.saml.dom.ext;
+package org.apache.wss4j.dom.saml.dom.ext;
 
 import java.io.InputStream;
 import java.security.KeyStore;
@@ -27,14 +27,14 @@ 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.dom.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.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.DOM2Writer;
 import org.apache.wss4j.common.util.Loader;
-import org.apache.wss4j.common.saml.dom.SAML2CallbackHandler;
+import org.apache.wss4j.dom.saml.dom.SAML2CallbackHandler;
 
 import org.apache.wss4j.api.dom.engine.WSSConfig;
 
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..adc058ed6 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.dom.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..a4d230597 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.dom.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..9cc78688f 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.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..45f115fbd 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.dom.saml.bean.Version;
+import org.apache.wss4j.dom.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..dff2b6052 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.bean.AttributeBean;
+import org.apache.wss4j.dom.saml.bean.AttributeStatementBean;
+import org.apache.wss4j.dom.saml.bean.SubjectBean;
+import org.apache.wss4j.dom.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..31c324576 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.bean.SubjectBean;
+import org.apache.wss4j.dom.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..932212227 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.bean.SubjectBean;
+import org.apache.wss4j.dom.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/resources/META-INF/services/org.apache.wss4j.api.dom.action.Action
 
b/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.action.Action
deleted file mode 100644
index 4ac0995eb..000000000
--- 
a/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.action.Action
+++ /dev/null
@@ -1,2 +0,0 @@
-org.apache.wss4j.common.saml.action.SAMLTokenUnsignedAction
-org.apache.wss4j.common.saml.action.SAMLTokenSignedAction
diff --git 
a/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.processor.Processor
 
b/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.processor.Processor
deleted file mode 100644
index ff35be5ea..000000000
--- 
a/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.processor.Processor
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.wss4j.common.saml.processor.SAMLTokenProcessor
diff --git 
a/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.saml.SAMLKeyInfoProcessor
 
b/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.saml.SAMLKeyInfoProcessor
deleted file mode 100644
index bc0a6c23b..000000000
--- 
a/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.saml.SAMLKeyInfoProcessor
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.wss4j.common.saml.message.WSSSAMLKeyInfoProcessor
diff --git 
a/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.validate.Validator
 
b/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.validate.Validator
deleted file mode 100644
index 450021932..000000000
--- 
a/ws-security-saml/src/main/resources/META-INF/services/org.apache.wss4j.api.dom.validate.Validator
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.wss4j.common.saml.validate.SamlAssertionValidator
diff --git a/ws-security-stax/pom.xml b/ws-security-stax/pom.xml
index 124c2f075..179b51eb4 100644
--- a/ws-security-stax/pom.xml
+++ b/ws-security-stax/pom.xml
@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.wss4j</groupId>
-            <artifactId>wss4j-ws-security-saml</artifactId>
+            <artifactId>wss4j-ws-security-dom-saml</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
@@ -81,7 +81,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.wss4j</groupId>
-            <artifactId>wss4j-ws-security-saml</artifactId>
+            <artifactId>wss4j-ws-security-dom-saml</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
             <classifier>tests</classifier>
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..b8134f510 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.dom.saml.OpenSAMLUtil;
+import org.apache.wss4j.dom.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..4a091e22e 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.dom.saml.OpenSAMLUtil;
+import org.apache.wss4j.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.bean.KeyInfoBean;
+import org.apache.wss4j.dom.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 65d6c705e..744c98e83 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
@@ -38,10 +38,10 @@ 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.dom.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.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.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/securityEvent/SamlTokenSecurityEvent.java
 
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/SamlTokenSecurityEvent.java
index 7171bb684..7a4c1a9a0 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
@@ -20,7 +20,7 @@ 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.dom.saml.SamlAssertionWrapper;
 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..c64995e0f 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.dom.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..910910463 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.dom.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..49edd97f9 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.dom.saml.OpenSAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
+import org.apache.wss4j.dom.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..6bbf648c8 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.dom.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..4303a38af 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.bean.SubjectBean;
+import org.apache.wss4j.dom.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/ReplayTest.java 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java
index 7dd423f35..ee2d8d00f 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.dom.saml.bean.ConditionsBean;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
 import org.apache.wss4j.api.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..dccdd13f2 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.dom.saml.OpenSAMLUtil;
+import org.apache.wss4j.dom.saml.bean.AttributeBean;
+import org.apache.wss4j.dom.saml.bean.AttributeStatementBean;
+import org.apache.wss4j.dom.saml.bean.SubjectConfirmationDataBean;
+import org.apache.wss4j.dom.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 63b9e0a22..c6f78a055 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.UnsupportedCallbackException;
@@ -33,7 +33,7 @@ import java.io.IOException;
  * A Callback Handler implementation for a SAML 1.1 assertion. By default it 
creates an
  * authentication assertion using Sender Vouches.
  */
-public class SAML1CallbackHandler extends 
org.apache.wss4j.common.saml.dom.SAML1CallbackHandler {
+public class SAML1CallbackHandler extends 
org.apache.wss4j.dom.saml.dom.SAML1CallbackHandler {
 
     private String issuerKeyName;
     private String issuerKeyPassword;
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 5b6033ef5..4d3aafd97 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.UnsupportedCallbackException;
@@ -33,7 +33,7 @@ import java.io.IOException;
  * A Callback Handler implementation for a SAML 2 assertion. By default it 
creates an
  * authentication assertion using Sender Vouches.
  */
-public class SAML2CallbackHandler extends 
org.apache.wss4j.common.saml.dom.SAML2CallbackHandler {
+public class SAML2CallbackHandler extends 
org.apache.wss4j.dom.saml.dom.SAML2CallbackHandler {
 
     private String issuerKeyName;
     private String issuerKeyPassword;
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 47511ebf8..dd66c4a07 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.bean.ActionBean;
+import org.apache.wss4j.dom.saml.bean.AttributeBean;
+import org.apache.wss4j.dom.saml.bean.AttributeStatementBean;
+import org.apache.wss4j.dom.saml.bean.AuthDecisionStatementBean;
+import org.apache.wss4j.dom.saml.bean.AuthenticationStatementBean;
+import org.apache.wss4j.dom.saml.bean.ConditionsBean;
+import org.apache.wss4j.dom.saml.bean.KeyInfoBean;
+import org.apache.wss4j.dom.saml.bean.NameIDBean;
+import org.apache.wss4j.dom.saml.bean.SubjectBean;
+import org.apache.wss4j.dom.saml.bean.SubjectConfirmationDataBean;
+import org.apache.wss4j.dom.saml.bean.SubjectLocalityBean;
+import org.apache.wss4j.dom.saml.bean.Version;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.KeyUtils;
 import org.apache.wss4j.api.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 cd0157133..eb7d2a95e 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,17 +36,17 @@ 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.bean.KeyInfoBean;
+import org.apache.wss4j.dom.saml.bean.Version;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
 import org.apache.wss4j.api.dom.message.WSSecHeader;
-import org.apache.wss4j.common.saml.message.WSSecSAMLToken;
+import org.apache.wss4j.dom.saml.message.WSSecSAMLToken;
 import org.apache.wss4j.stax.ext.WSSConstants;
 import org.apache.wss4j.stax.ext.WSSSecurityProperties;
 import org.apache.wss4j.stax.impl.securityToken.HttpsSecurityTokenImpl;
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 76701c83d..2ced341f6 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.dom.saml.builder.SAML1Constants;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
 import org.apache.wss4j.api.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 a229cdf89..704ed8c3d 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,19 +39,19 @@ 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.bean.Version;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.KeyUtils;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.api.dom.WSConstants;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
 import org.apache.wss4j.dom.message.WSSecEncrypt;
 import org.apache.wss4j.api.dom.message.WSSecHeader;
-import org.apache.wss4j.common.saml.message.WSSecSignatureSAML;
+import org.apache.wss4j.dom.saml.message.WSSecSignatureSAML;
 import org.apache.wss4j.stax.ext.WSSConstants;
 import org.apache.wss4j.stax.ext.WSSSecurityProperties;
 import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants;
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..654445a40 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.dom.saml.bean.Version;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
+import org.apache.wss4j.dom.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 4065f35de..b3036066c 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,19 +44,19 @@ 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.bean.Version;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
+import org.apache.wss4j.dom.saml.builder.SAML2Constants;
 import org.apache.wss4j.api.dom.token.SecurityTokenReference;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.api.dom.WSConstants;
 import org.apache.wss4j.common.crypto.KeystoreCallbackHandler;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
 import org.apache.wss4j.api.dom.message.WSSecHeader;
-import org.apache.wss4j.common.saml.message.WSSecSAMLToken;
+import org.apache.wss4j.dom.saml.message.WSSecSAMLToken;
 import org.apache.wss4j.stax.ext.WSSConstants;
 import org.apache.wss4j.stax.ext.WSSSecurityProperties;
 import org.apache.wss4j.stax.setup.ConfigurationConverter;
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..47105fb77 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.dom.saml.builder.SAML1Constants;
+import org.apache.wss4j.dom.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..3c539461a 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.dom.saml.bean.AudienceRestrictionBean;
+import org.apache.wss4j.dom.saml.bean.ConditionsBean;
+import org.apache.wss4j.dom.saml.bean.ProxyRestrictionBean;
+import org.apache.wss4j.dom.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 6800b3c07..470715c1e 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.dom.saml.SAMLCallback;
+import org.apache.wss4j.dom.saml.SAMLUtil;
+import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
+import org.apache.wss4j.dom.saml.builder.SAML1Constants;
 import org.apache.wss4j.api.dom.token.SecurityTokenReference;
 import org.apache.wss4j.common.util.SOAPUtil;
 import org.apache.wss4j.api.dom.WSConstants;

(ws-wss4j) branch coheigea/saml-refactor-new updated: Renaming saml module to dom-saml

Reply via email to