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 85a7930e6 Moving a few more utils into Stax Api
85a7930e6 is described below
commit 85a7930e646fea9b6c6433e296665be7059e8910
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Fri Jul 11 10:39:47 2025 +0100
Moving a few more utils into Stax Api
---
.../src/main/java/org/apache/wss4j/api/stax}/SecurityHeaderOrder.java | 2 +-
.../org/apache/wss4j/api/stax/processor}/OutputProcessorUtils.java | 4 ++--
ws-security-dom-saml/pom.xml | 2 +-
.../impl/processor/output/BinarySecurityTokenOutputProcessor.java | 1 +
.../wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java | 1 +
.../stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java | 1 +
.../stax/impl/processor/output/EncryptEndingOutputProcessor.java | 3 ++-
.../wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java | 1 +
.../stax/impl/processor/output/ReferenceListOutputProcessor.java | 1 +
.../wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java | 1 +
.../impl/processor/output/SecurityContextTokenOutputProcessor.java | 1 +
.../stax/impl/processor/output/SecurityHeaderReorderProcessor.java | 2 +-
.../impl/processor/output/SignatureConfirmationOutputProcessor.java | 1 +
.../wss4j/stax/impl/processor/output/TimestampOutputProcessor.java | 1 +
.../stax/impl/processor/output/UsernameTokenOutputProcessor.java | 1 +
.../stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java | 3 ++-
16 files changed, 19 insertions(+), 7 deletions(-)
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/SecurityHeaderOrder.java
b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/SecurityHeaderOrder.java
similarity index 97%
rename from
ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/SecurityHeaderOrder.java
rename to
ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/SecurityHeaderOrder.java
index 58b870eee..8b4c8e302 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/SecurityHeaderOrder.java
+++
b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/SecurityHeaderOrder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.wss4j.stax.impl;
+package org.apache.wss4j.api.stax;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/OutputProcessorUtils.java
b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/processor/OutputProcessorUtils.java
similarity index 95%
rename from
ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/OutputProcessorUtils.java
rename to
ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/processor/OutputProcessorUtils.java
index 8b030d4da..19d71def6 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/OutputProcessorUtils.java
+++
b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/processor/OutputProcessorUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.wss4j.stax.impl.processor.output;
+package org.apache.wss4j.api.stax.processor;
import java.util.Collections;
import java.util.List;
@@ -24,8 +24,8 @@ import java.util.Map;
import javax.xml.namespace.QName;
+import org.apache.wss4j.api.stax.SecurityHeaderOrder;
import org.apache.wss4j.api.stax.ext.WSSConstants;
-import org.apache.wss4j.stax.impl.SecurityHeaderOrder;
import org.apache.xml.security.stax.ext.OutboundSecurityContext;
import org.apache.xml.security.stax.ext.OutputProcessorChain;
import org.apache.xml.security.stax.ext.SecurePart;
diff --git a/ws-security-dom-saml/pom.xml b/ws-security-dom-saml/pom.xml
index f7044f222..c336c0e2d 100644
--- a/ws-security-dom-saml/pom.xml
+++ b/ws-security-dom-saml/pom.xml
@@ -33,7 +33,7 @@
net.shibboleth*;resolution:=optional,
com.sun.security.jgss*;resolution:=optional
</wss4j.osgi.import>
- <wss4j.module.name>org.apache.wss4j.saml</wss4j.module.name>
+ <wss4j.module.name>org.apache.wss4j.dom.saml</wss4j.module.name>
</properties>
<build>
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java
index 4f4adea0b..efb61a601 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java
@@ -26,6 +26,7 @@ import javax.xml.stream.XMLStreamException;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
+import org.apache.wss4j.api.stax.processor.OutputProcessorUtils;
import org.apache.wss4j.stax.impl.securityToken.KerberosClientSecurityToken;
import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants;
import org.apache.wss4j.api.stax.utils.WSSUtils;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java
index 80f4bd516..2f03a1ef3 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java
@@ -28,6 +28,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
+import org.apache.wss4j.api.stax.processor.OutputProcessorUtils;
import org.apache.wss4j.api.stax.utils.WSSUtils;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.AbstractOutputProcessor;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
index 1408377b5..03f8b597f 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
@@ -35,6 +35,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.KeyUtils;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
+import org.apache.wss4j.api.stax.processor.OutputProcessorUtils;
import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants;
import org.apache.wss4j.api.stax.utils.WSSUtils;
import org.apache.xml.security.exceptions.XMLSecurityException;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptEndingOutputProcessor.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptEndingOutputProcessor.java
index 3fbd66417..00dccd83b 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptEndingOutputProcessor.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptEndingOutputProcessor.java
@@ -28,7 +28,8 @@ import javax.xml.stream.XMLStreamException;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
-import org.apache.wss4j.stax.impl.SecurityHeaderOrder;
+import org.apache.wss4j.api.stax.processor.OutputProcessorUtils;
+import org.apache.wss4j.api.stax.SecurityHeaderOrder;
import org.apache.wss4j.api.stax.utils.WSSUtils;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.OutputProcessorChain;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java
index da5270300..3656de0ad 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java
@@ -44,6 +44,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
+import org.apache.wss4j.api.stax.processor.OutputProcessorUtils;
import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants;
import org.apache.wss4j.api.stax.utils.WSSUtils;
import org.apache.xml.security.exceptions.XMLSecurityException;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/ReferenceListOutputProcessor.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/ReferenceListOutputProcessor.java
index bbc307e19..ee76a3b07 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/ReferenceListOutputProcessor.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/ReferenceListOutputProcessor.java
@@ -23,6 +23,7 @@ import javax.xml.stream.XMLStreamException;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
+import org.apache.wss4j.api.stax.processor.OutputProcessorUtils;
import org.apache.wss4j.api.stax.utils.WSSUtils;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.AbstractOutputProcessor;
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 065f3adb4..da9fb2f1c 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
@@ -43,6 +43,7 @@ import
org.apache.wss4j.api.stax.ext.WSSConfigurationException;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurePart;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
+import org.apache.wss4j.api.stax.processor.OutputProcessorUtils;
import org.apache.wss4j.api.stax.securityEvent.WSSecurityEventConstants;
import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants;
import org.apache.wss4j.api.stax.utils.WSSUtils;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java
index aaa8183f8..c98b6c6d1 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java
@@ -30,6 +30,7 @@ import javax.xml.stream.XMLStreamException;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
+import org.apache.wss4j.api.stax.processor.OutputProcessorUtils;
import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants;
import org.apache.wss4j.api.stax.utils.WSSUtils;
import org.apache.xml.security.exceptions.XMLSecurityException;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java
index 25954aaeb..b2b2e47f3 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java
@@ -33,7 +33,7 @@ import javax.xml.stream.XMLStreamException;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
-import org.apache.wss4j.stax.impl.SecurityHeaderOrder;
+import org.apache.wss4j.api.stax.SecurityHeaderOrder;
import org.apache.wss4j.api.stax.utils.WSSUtils;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.AbstractOutputProcessor;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java
index feda6361c..e13621098 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java
@@ -26,6 +26,7 @@ import javax.xml.stream.XMLStreamException;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
+import org.apache.wss4j.api.stax.processor.OutputProcessorUtils;
import org.apache.wss4j.api.stax.utils.WSSUtils;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.AbstractOutputProcessor;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/TimestampOutputProcessor.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/TimestampOutputProcessor.java
index dc0dcf630..71312d0fa 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/TimestampOutputProcessor.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/TimestampOutputProcessor.java
@@ -28,6 +28,7 @@ import javax.xml.stream.XMLStreamException;
import org.apache.wss4j.common.util.DateUtil;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
+import org.apache.wss4j.api.stax.processor.OutputProcessorUtils;
import org.apache.wss4j.api.stax.utils.WSSUtils;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.AbstractOutputProcessor;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java
index 88361fa67..b78c39b1b 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java
@@ -24,6 +24,7 @@ import org.apache.wss4j.common.util.DateUtil;
import org.apache.wss4j.common.util.UsernameTokenUtil;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
+import org.apache.wss4j.api.stax.processor.OutputProcessorUtils;
import org.apache.wss4j.stax.impl.securityToken.OutboundUsernameSecurityToken;
import org.apache.wss4j.api.stax.utils.WSSUtils;
import org.apache.xml.security.exceptions.XMLSecurityException;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
index 0d01eb1e1..acb36c6dc 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
@@ -21,7 +21,8 @@ package org.apache.wss4j.stax.impl.processor.output;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
-import org.apache.wss4j.stax.impl.SecurityHeaderOrder;
+import org.apache.wss4j.api.stax.processor.OutputProcessorUtils;
+import org.apache.wss4j.api.stax.SecurityHeaderOrder;
import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants;
import org.apache.wss4j.api.stax.utils.WSSUtils;
import org.apache.xml.security.exceptions.XMLSecurityException;
