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 11925a80f Moving CallbackLookup to API module
11925a80f is described below
commit 11925a80ff522c5ae52a30064336999c0a84446a
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Tue Jul 8 11:13:23 2025 +0100
Moving CallbackLookup to API module
---
.../src/main/java/org/apache/wss4j/api/dom/WSDocInfo.java | 2 +-
.../src/main/java/org/apache/wss4j/api/dom/WSEncryptionPart.java | 2 +-
.../main/java/org/apache/wss4j/api/dom}/callback/CallbackLookup.java | 2 +-
.../main/java/org/apache/wss4j/api/dom/callback/DOMCallbackLookup.java | 1 -
.../src/main/java/org/apache/wss4j/api/dom/message/WSSecBase.java | 2 +-
.../src/main/java/org/apache/wss4j/api/dom/processor/STRParserUtil.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngine.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/message/Encryptor.java | 2 +-
.../main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java | 2 +-
10 files changed, 9 insertions(+), 10 deletions(-)
diff --git
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/WSDocInfo.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/WSDocInfo.java
index d92adcadb..a7223e568 100644
--- a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/WSDocInfo.java
+++ b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/WSDocInfo.java
@@ -41,7 +41,7 @@ import javax.xml.crypto.dom.DOMCryptoContext;
import org.apache.wss4j.common.WSS4JConstants;
import org.apache.wss4j.common.crypto.Crypto;
-import org.apache.wss4j.common.callback.CallbackLookup;
+import org.apache.wss4j.api.dom.callback.CallbackLookup;
import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.XMLUtils;
diff --git
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/WSEncryptionPart.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/WSEncryptionPart.java
index 4c00e8210..817437c6f 100644
---
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/WSEncryptionPart.java
+++
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/WSEncryptionPart.java
@@ -22,7 +22,7 @@ package org.apache.wss4j.api.dom;
import java.util.Collections;
import java.util.List;
-import org.apache.wss4j.common.callback.CallbackLookup;
+import org.apache.wss4j.api.dom.callback.CallbackLookup;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.w3c.dom.Element;
diff --git
a/ws-security-common/src/main/java/org/apache/wss4j/common/callback/CallbackLookup.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/callback/CallbackLookup.java
similarity index 98%
rename from
ws-security-common/src/main/java/org/apache/wss4j/common/callback/CallbackLookup.java
rename to
ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/callback/CallbackLookup.java
index 012518ecc..6d78a26a2 100644
---
a/ws-security-common/src/main/java/org/apache/wss4j/common/callback/CallbackLookup.java
+++
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/callback/CallbackLookup.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.common.callback;
+package org.apache.wss4j.api.dom.callback;
import java.util.List;
diff --git
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/callback/DOMCallbackLookup.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/callback/DOMCallbackLookup.java
index 66b4f1181..8acb28e82 100644
---
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/callback/DOMCallbackLookup.java
+++
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/callback/DOMCallbackLookup.java
@@ -25,7 +25,6 @@ import java.util.List;
import javax.xml.crypto.dom.DOMCryptoContext;
import org.apache.wss4j.common.WSS4JConstants;
-import org.apache.wss4j.common.callback.CallbackLookup;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.XMLUtils;
import org.w3c.dom.Document;
diff --git
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecBase.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecBase.java
index e498d5744..7dffa2f52 100644
---
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecBase.java
+++
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/message/WSSecBase.java
@@ -20,7 +20,7 @@
package org.apache.wss4j.api.dom.message;
import org.apache.wss4j.api.dom.WSEncryptionPart;
-import org.apache.wss4j.common.callback.CallbackLookup;
+import org.apache.wss4j.api.dom.callback.CallbackLookup;
import org.apache.wss4j.api.dom.callback.DOMCallbackLookup;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.api.dom.WSConstants;
diff --git
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/processor/STRParserUtil.java
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/processor/STRParserUtil.java
index 9cac98208..4f3c79ee5 100644
---
a/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/processor/STRParserUtil.java
+++
b/ws-security-api-dom/src/main/java/org/apache/wss4j/api/dom/processor/STRParserUtil.java
@@ -24,7 +24,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.apache.wss4j.common.bsp.BSPEnforcer;
import org.apache.wss4j.common.bsp.BSPRule;
-import org.apache.wss4j.common.callback.CallbackLookup;
+import org.apache.wss4j.api.dom.callback.CallbackLookup;
import org.apache.wss4j.api.dom.callback.DOMCallbackLookup;
import org.apache.wss4j.common.ext.WSPasswordCallback;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngine.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngine.java
index da350c075..df4df9714 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngine.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngine.java
@@ -31,7 +31,7 @@ import org.apache.wss4j.common.bsp.BSPRule;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.api.dom.engine.WSSConfig;
import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
-import org.apache.wss4j.common.callback.CallbackLookup;
+import org.apache.wss4j.api.dom.callback.CallbackLookup;
import org.apache.wss4j.api.dom.callback.DOMCallbackLookup;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.dom.WSConstants;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
index 5832ca16b..94b261e7b 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
@@ -35,7 +35,7 @@ import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
import org.apache.wss4j.api.dom.WSEncryptionPart;
-import org.apache.wss4j.common.callback.CallbackLookup;
+import org.apache.wss4j.api.dom.callback.CallbackLookup;
import org.apache.wss4j.api.dom.callback.DOMCallbackLookup;
import org.apache.wss4j.api.dom.message.WSSecHeader;
import org.apache.wss4j.common.ext.Attachment;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
index 5cca79868..2a5e300d0 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
@@ -54,7 +54,7 @@ import org.apache.wss4j.common.crypto.AlgorithmSuite;
import org.apache.wss4j.common.crypto.AlgorithmSuiteValidator;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoType;
-import org.apache.wss4j.common.callback.CallbackLookup;
+import org.apache.wss4j.api.dom.callback.CallbackLookup;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.PublicKeyPrincipalImpl;
import org.apache.wss4j.common.principal.UsernameTokenPrincipal;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
index 9e628bfc9..05ddf52cc 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
@@ -19,7 +19,7 @@
package org.apache.wss4j.dom.util;
-import org.apache.wss4j.common.callback.CallbackLookup;
+import org.apache.wss4j.api.dom.callback.CallbackLookup;
import org.apache.wss4j.common.ext.Attachment;
import org.apache.wss4j.common.ext.AttachmentRequestCallback;
import org.apache.wss4j.common.ext.AttachmentResultCallback;
