You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2025/06/17 01:49:59 UTC
(ws-wss4j) 01/01: Adding new ws-security-saml module
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch coheigea/saml-refactor-new
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
commit e772646fb004dd76f533ae11210cabc9d77fdf4d
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jun 17 02:49:36 2025 +0100
Adding new ws-security-saml module
---
ws-security-common/pom.xml | 100 ---------------------
ws-security-dom/pom.xml | 6 ++
{ws-security-common => ws-security-saml}/pom.xml | 57 ++----------
.../wss4j/common/principal/SAMLTokenPrincipal.java | 0
.../common/principal/SAMLTokenPrincipalImpl.java | 0
.../wss4j/common/saml/OpenSAMLBootstrap.java | 0
.../org/apache/wss4j/common/saml/OpenSAMLUtil.java | 0
.../org/apache/wss4j/common/saml/SAMLCallback.java | 0
.../org/apache/wss4j/common/saml/SAMLKeyInfo.java | 0
.../wss4j/common/saml/SAMLKeyInfoProcessor.java | 0
.../org/apache/wss4j/common/saml/SAMLUtil.java | 0
.../wss4j/common/saml/SamlAssertionWrapper.java | 0
.../saml/WSS4JXSBase64BinaryUnmarshaller.java | 0
.../apache/wss4j/common/saml/bean/ActionBean.java | 0
.../apache/wss4j/common/saml/bean/AdviceBean.java | 0
.../wss4j/common/saml/bean/AttributeBean.java | 0
.../common/saml/bean/AttributeStatementBean.java | 0
.../common/saml/bean/AudienceRestrictionBean.java | 0
.../saml/bean/AuthDecisionStatementBean.java | 0
.../saml/bean/AuthenticationStatementBean.java | 0
.../wss4j/common/saml/bean/ConditionsBean.java | 0
.../wss4j/common/saml/bean/DelegateBean.java | 0
.../apache/wss4j/common/saml/bean/KeyInfoBean.java | 0
.../apache/wss4j/common/saml/bean/NameIDBean.java | 0
.../common/saml/bean/ProxyRestrictionBean.java | 0
.../apache/wss4j/common/saml/bean/SubjectBean.java | 0
.../saml/bean/SubjectConfirmationDataBean.java | 0
.../common/saml/bean/SubjectLocalityBean.java | 0
.../org/apache/wss4j/common/saml/bean/Version.java | 0
.../common/saml/builder/SAML1ComponentBuilder.java | 0
.../wss4j/common/saml/builder/SAML1Constants.java | 0
.../common/saml/builder/SAML2ComponentBuilder.java | 0
.../wss4j/common/saml/builder/SAML2Constants.java | 0
.../apache/wss4j/common/saml/OpenSAMLUtilTest.java | 0
ws-security-stax/pom.xml | 6 ++
35 files changed, 20 insertions(+), 149 deletions(-)
diff --git a/ws-security-common/pom.xml b/ws-security-common/pom.xml
index c224eefe3..bb3be05b3 100644
--- a/ws-security-common/pom.xml
+++ b/ws-security-common/pom.xml
@@ -30,14 +30,12 @@
<properties>
<wss4j.osgi.import>
- net.shibboleth*;resolution:=optional,
com.sun.security.jgss*;resolution:=optional
</wss4j.osgi.import>
<!--
<DynamicImport-Package>
org.bouncycastle.jce.provider,
org.apache.wss4j.components.crypto,
- org.apache.wss4j.saml
</DynamicImport-Package>
-->
<wss4j.module.name>org.apache.wss4j.common</wss4j.module.name>
@@ -106,104 +104,6 @@
<artifactId>xmlsec</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-saml-impl</artifactId>
- <version>${opensaml.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-soap-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-storage-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-messaging-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.cryptacular</groupId>
- <artifactId>cryptacular</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.cryptacular</groupId>
- <artifactId>cryptacular</artifactId>
- <version>${cryptacular.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>33.4.8-jre</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>listenablefuture</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.j2objc</groupId>
- <artifactId>j2objc-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-annotations</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-xacml-impl</artifactId>
- <version>${opensaml.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-xacml-saml-impl</artifactId>
- <version>${opensaml.version}</version>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
diff --git a/ws-security-dom/pom.xml b/ws-security-dom/pom.xml
index 89dcde781..6535ce4a4 100644
--- a/ws-security-dom/pom.xml
+++ b/ws-security-dom/pom.xml
@@ -94,6 +94,12 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-ws-security-saml</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
diff --git a/ws-security-common/pom.xml b/ws-security-saml/pom.xml
similarity index 81%
copy from ws-security-common/pom.xml
copy to ws-security-saml/pom.xml
index c224eefe3..831edfdb1 100644
--- a/ws-security-common/pom.xml
+++ b/ws-security-saml/pom.xml
@@ -25,22 +25,15 @@
<relativePath>../parent/pom.xml</relativePath>
<version>4.0.1-SNAPSHOT</version>
</parent>
- <artifactId>wss4j-ws-security-common</artifactId>
- <name>Apache WSS4J WS-Security Common</name>
+ <artifactId>wss4j-ws-security-saml</artifactId>
+ <name>Apache WSS4J WS-Security SAML</name>
<properties>
<wss4j.osgi.import>
net.shibboleth*;resolution:=optional,
com.sun.security.jgss*;resolution:=optional
</wss4j.osgi.import>
- <!--
- <DynamicImport-Package>
- org.bouncycastle.jce.provider,
- org.apache.wss4j.components.crypto,
- org.apache.wss4j.saml
- </DynamicImport-Package>
- -->
- <wss4j.module.name>org.apache.wss4j.common</wss4j.module.name>
+ <wss4j.module.name>org.apache.wss4j.saml</wss4j.module.name>
</properties>
<build>
@@ -92,13 +85,14 @@
<dependencies>
<dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-ws-security-common</artifactId>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -204,36 +198,6 @@
<version>${opensaml.version}</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- <classifier>jakarta</classifier>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk18on</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bc-fips</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jasypt</groupId>
- <artifactId>jasypt</artifactId>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
@@ -254,11 +218,6 @@
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/principal/SAMLTokenPrincipal.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/principal/SAMLTokenPrincipal.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/principal/SAMLTokenPrincipal.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/principal/SAMLTokenPrincipal.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/principal/SAMLTokenPrincipalImpl.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/principal/SAMLTokenPrincipalImpl.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/principal/SAMLTokenPrincipalImpl.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/principal/SAMLTokenPrincipalImpl.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLCallback.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SAMLCallback.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLCallback.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SAMLCallback.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLKeyInfo.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SAMLKeyInfo.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLKeyInfo.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SAMLKeyInfo.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLKeyInfoProcessor.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SAMLKeyInfoProcessor.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLKeyInfoProcessor.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SAMLKeyInfoProcessor.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/WSS4JXSBase64BinaryUnmarshaller.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/WSS4JXSBase64BinaryUnmarshaller.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/WSS4JXSBase64BinaryUnmarshaller.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/WSS4JXSBase64BinaryUnmarshaller.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ActionBean.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/ActionBean.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ActionBean.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/ActionBean.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeStatementBean.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AttributeStatementBean.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeStatementBean.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AttributeStatementBean.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ConditionsBean.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/ConditionsBean.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ConditionsBean.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/ConditionsBean.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/DelegateBean.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/DelegateBean.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/DelegateBean.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/DelegateBean.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/KeyInfoBean.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/KeyInfoBean.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/KeyInfoBean.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/KeyInfoBean.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/NameIDBean.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/NameIDBean.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/NameIDBean.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/NameIDBean.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectConfirmationDataBean.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/SubjectConfirmationDataBean.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectConfirmationDataBean.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/SubjectConfirmationDataBean.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectLocalityBean.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/SubjectLocalityBean.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectLocalityBean.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/SubjectLocalityBean.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/Version.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/Version.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/Version.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/bean/Version.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1Constants.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML1Constants.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1Constants.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML1Constants.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2Constants.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML2Constants.java
similarity index 100%
rename from ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2Constants.java
rename to ws-security-saml/src/main/java/org/apache/wss4j/common/saml/builder/SAML2Constants.java
diff --git a/ws-security-common/src/test/java/org/apache/wss4j/common/saml/OpenSAMLUtilTest.java b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/OpenSAMLUtilTest.java
similarity index 100%
rename from ws-security-common/src/test/java/org/apache/wss4j/common/saml/OpenSAMLUtilTest.java
rename to ws-security-saml/src/test/java/org/apache/wss4j/common/saml/OpenSAMLUtilTest.java
diff --git a/ws-security-stax/pom.xml b/ws-security-stax/pom.xml
index b712a828c..cdd72d0e4 100644
--- a/ws-security-stax/pom.xml
+++ b/ws-security-stax/pom.xml
@@ -47,6 +47,12 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-ws-security-saml</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>