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 30d090eb4178bfb16a8ff3059bab474037e999a3
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Fri Jun 20 11:07:37 2025 +0100

    Moving WSSecBase to common
---
 .../src/main/java/org/apache/wss4j/common}/dom/message/WSSecBase.java  | 3 +--
 .../src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java  | 1 +
 .../src/main/java/org/apache/wss4j/dom/message/WSSecSAMLToken.java     | 1 +
 .../src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java | 1 +
 .../java/org/apache/wss4j/dom/message/WSSecSignatureConfirmation.java  | 1 +
 .../src/main/java/org/apache/wss4j/dom/message/WSSecTimestamp.java     | 2 +-
 .../src/main/java/org/apache/wss4j/dom/message/WSSecUsernameToken.java | 2 +-
 7 files changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java 
b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/message/WSSecBase.java
similarity index 98%
rename from 
ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java
rename to 
ws-security-common/src/main/java/org/apache/wss4j/common/dom/message/WSSecBase.java
index c305d08f3..012b8bdef 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java
+++ 
b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/message/WSSecBase.java
@@ -17,12 +17,11 @@
  * under the License.
  */
 
-package org.apache.wss4j.dom.message;
+package org.apache.wss4j.common.dom.message;
 
 import org.apache.wss4j.common.WSEncryptionPart;
 import org.apache.wss4j.common.dom.callback.CallbackLookup;
 import org.apache.wss4j.common.dom.callback.DOMCallbackLookup;
-import org.apache.wss4j.common.dom.message.WSSecHeader;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.common.dom.WSConstants;
 import org.apache.wss4j.common.dom.WSDocInfo;
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java
index 1248ceaf3..d68c1f230 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java
@@ -22,6 +22,7 @@ package org.apache.wss4j.dom.message;
 import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoType;
+import org.apache.wss4j.common.dom.message.WSSecBase;
 import org.apache.wss4j.common.dom.message.WSSecHeader;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.token.*;
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSAMLToken.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSAMLToken.java
index 9896d57bb..d66bbdd7c 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSAMLToken.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSAMLToken.java
@@ -19,6 +19,7 @@
 
 package org.apache.wss4j.dom.message;
 
+import org.apache.wss4j.common.dom.message.WSSecBase;
 import org.apache.wss4j.common.dom.message.WSSecHeader;
 import org.apache.wss4j.common.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.XMLUtils;
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
index 91da8dd7c..b6615a6b4 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
@@ -34,6 +34,7 @@ import javax.xml.crypto.dsig.XMLSignatureFactory;
 import javax.xml.crypto.dsig.spec.ExcC14NParameterSpec;
 import javax.xml.crypto.dsig.spec.TransformParameterSpec;
 
+import org.apache.wss4j.common.dom.message.WSSecBase;
 import org.apache.wss4j.common.dom.message.WSSecHeader;
 import org.apache.wss4j.common.WSEncryptionPart;
 import org.apache.wss4j.common.dom.callback.DOMCallbackLookup;
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureConfirmation.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureConfirmation.java
index 590611c60..4e5817a79 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureConfirmation.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureConfirmation.java
@@ -19,6 +19,7 @@
 
 package org.apache.wss4j.dom.message;
 
+import org.apache.wss4j.common.dom.message.WSSecBase;
 import org.apache.wss4j.common.dom.message.WSSecHeader;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.common.dom.message.token.SignatureConfirmation;
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecTimestamp.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecTimestamp.java
index eba097040..167dbe8b9 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecTimestamp.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecTimestamp.java
@@ -21,7 +21,7 @@ package org.apache.wss4j.dom.message;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-
+import org.apache.wss4j.common.dom.message.WSSecBase;
 import org.apache.wss4j.common.dom.message.WSSecHeader;
 import org.apache.wss4j.common.util.WSCurrentTimeSource;
 import org.apache.wss4j.common.util.WSTimeSource;
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecUsernameToken.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecUsernameToken.java
index 6c17b1a97..6eeee43e6 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecUsernameToken.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecUsernameToken.java
@@ -20,7 +20,7 @@
 package org.apache.wss4j.dom.message;
 
 import org.apache.wss4j.common.dom.WSConstants;
-
+import org.apache.wss4j.common.dom.message.WSSecBase;
 import org.apache.wss4j.common.dom.message.WSSecHeader;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.util.UsernameTokenUtil;

Reply via email to