This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/master by this push: new 6d3d66f Some fixes following latest Santuario changes 6d3d66f is described below commit 6d3d66f3cb8ce37ccad6812f6e030ea147266729 Author: Colm O hEigeartaigh <cohei...@apache.org> AuthorDate: Tue Apr 14 07:49:50 2020 +0100 Some fixes following latest Santuario changes --- .../impl/processor/output/BinarySecurityTokenOutputProcessor.java | 4 ++-- .../wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java | 4 ++-- .../stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java | 4 ++-- .../wss4j/stax/impl/processor/output/EncryptOutputProcessor.java | 2 +- .../wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java | 4 ++-- .../stax/impl/processor/output/ReferenceListOutputProcessor.java | 2 +- .../wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java | 4 ++-- .../impl/processor/output/SecurityContextTokenOutputProcessor.java | 4 ++-- .../stax/impl/processor/output/SecurityHeaderOutputProcessor.java | 2 +- .../stax/impl/processor/output/SecurityHeaderReorderProcessor.java | 2 +- .../impl/processor/output/SignatureConfirmationOutputProcessor.java | 2 +- .../wss4j/stax/impl/processor/output/TimestampOutputProcessor.java | 2 +- .../stax/impl/processor/output/UsernameTokenOutputProcessor.java | 4 ++-- .../wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) 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 8c14816..bcfb342 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 @@ -48,7 +48,7 @@ public class BinarySecurityTokenOutputProcessor extends AbstractOutputProcessor } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { try { GenericOutboundSecurityToken securityToken = null; @@ -149,7 +149,7 @@ public class BinarySecurityTokenOutputProcessor extends AbstractOutputProcessor } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { outputProcessorChain.processEvent(xmlSecEvent); 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 5385a86..4eaa1a1 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 @@ -50,7 +50,7 @@ public class CustomTokenOutputProcessor extends AbstractOutputProcessor { } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { try { String tokenId = outputProcessorChain.getSecurityContext().get(WSSConstants.PROP_USE_THIS_TOKEN_ID_FOR_CUSTOM_TOKEN); @@ -91,7 +91,7 @@ public class CustomTokenOutputProcessor extends AbstractOutputProcessor { } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { outputProcessorChain.processEvent(xmlSecEvent); 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 82ab702..459794c 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 @@ -58,7 +58,7 @@ public class DerivedKeyTokenOutputProcessor extends AbstractOutputProcessor { } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { try { @@ -219,7 +219,7 @@ public class DerivedKeyTokenOutputProcessor extends AbstractOutputProcessor { } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { outputProcessorChain.processEvent(xmlSecEvent); diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java index 50adfd8..5f2baa1 100644 --- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java +++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java @@ -86,7 +86,7 @@ public class EncryptOutputProcessor extends AbstractEncryptOutputProcessor { } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { if (xmlSecEvent.getEventType() == XMLStreamConstants.START_ELEMENT) { XMLSecStartElement xmlSecStartElement = xmlSecEvent.asStartElement(); 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 1d44039..54143af 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 @@ -66,7 +66,7 @@ public class EncryptedKeyOutputProcessor extends AbstractOutputProcessor { } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { try { @@ -196,7 +196,7 @@ public class EncryptedKeyOutputProcessor extends AbstractOutputProcessor { } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { outputProcessorChain.processEvent(xmlSecEvent); 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 3d42635..67c506d 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 @@ -36,7 +36,7 @@ public class ReferenceListOutputProcessor extends AbstractOutputProcessor { } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { outputProcessorChain.processEvent(xmlSecEvent); 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 6f96e44..4047d46 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 @@ -73,7 +73,7 @@ public class SAMLTokenOutputProcessor extends AbstractOutputProcessor { } @Override - public void processEvent(XMLSecEvent xmlSecEvent, final OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, final OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { try { @@ -440,7 +440,7 @@ public class SAMLTokenOutputProcessor extends AbstractOutputProcessor { } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { outputProcessorChain.processEvent(xmlSecEvent); 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 63e645d..cb2be23 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 @@ -50,7 +50,7 @@ public class SecurityContextTokenOutputProcessor extends AbstractOutputProcessor } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { try { String tokenId = outputProcessorChain.getSecurityContext().get(WSSConstants.PROP_USE_THIS_TOKEN_ID_FOR_SECURITYCONTEXTTOKEN); @@ -152,7 +152,7 @@ public class SecurityContextTokenOutputProcessor extends AbstractOutputProcessor } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { outputProcessorChain.processEvent(xmlSecEvent); diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java index 341ba9c..d589d83 100644 --- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java +++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java @@ -49,7 +49,7 @@ public class SecurityHeaderOutputProcessor extends AbstractOutputProcessor { } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { boolean eventHandled = false; 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 afa82bc..1ea64ba 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 @@ -87,7 +87,7 @@ public class SecurityHeaderReorderProcessor extends AbstractOutputProcessor { } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { int documentLevel = xmlSecEvent.getDocumentLevel(); 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 89d9c31..8dca6e1 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 @@ -47,7 +47,7 @@ public class SignatureConfirmationOutputProcessor extends AbstractOutputProcesso } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { outputProcessorChain.processEvent(xmlSecEvent); 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 abd67db..6087681 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 @@ -56,7 +56,7 @@ public class TimestampOutputProcessor extends AbstractOutputProcessor { */ @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { outputProcessorChain.processEvent(xmlSecEvent); 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 9b6f36a..e9ae223 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 @@ -54,7 +54,7 @@ public class UsernameTokenOutputProcessor extends AbstractOutputProcessor { } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { try { @@ -174,7 +174,7 @@ public class UsernameTokenOutputProcessor extends AbstractOutputProcessor { } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { outputProcessorChain.processEvent(xmlSecEvent); diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java index a750444..2d28fb3 100644 --- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java +++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java @@ -74,7 +74,7 @@ public class WSSSignatureOutputProcessor extends AbstractSignatureOutputProcesso } @Override - public void processEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) + public void processNextEvent(XMLSecEvent xmlSecEvent, OutputProcessorChain outputProcessorChain) throws XMLStreamException, XMLSecurityException { if (xmlSecEvent.getEventType() == XMLStreamConstants.START_ELEMENT) { XMLSecStartElement xmlSecStartElement = xmlSecEvent.asStartElement();