Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/383328d4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/383328d4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/383328d4 Branch: refs/heads/3.0.x-fixes Commit: 383328d4ff23fa6f5ae751dc684915d60a679a74 Parents: 9fe27a7 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Jul 8 16:48:23 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Jul 8 16:48:23 2015 +0100 ---------------------------------------------------------------------- .../wss4j/PolicyBasedWSS4JOutInterceptor.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/383328d4/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java index db37434..0dbb313 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java @@ -30,11 +30,8 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import org.w3c.dom.Element; -<<<<<<< HEAD -======= import org.apache.cxf.attachment.AttachmentUtil; ->>>>>>> 419478e... Add a warning for MTOM for the policy case as well import org.apache.cxf.binding.soap.SoapFault; import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; @@ -133,16 +130,13 @@ public class PolicyBasedWSS4JOutInterceptor extends AbstractPhaseInterceptor<Soa ); String actor = (String)message.getContextualProperty(SecurityConstants.ACTOR); -<<<<<<< HEAD - AssertionInfoMap aim = message.get(AssertionInfoMap.class); -======= if (AttachmentUtil.isMtomEnabled(message) && hasAttachments(message)) { LOG.warning("MTOM is enabled with WS-Security. Please note that if an attachment is" + "referenced in the SOAP Body, only the reference will be signed and not the" + "SOAP Body!"); } - ->>>>>>> 419478e... Add a warning for MTOM for the policy case as well + + AssertionInfoMap aim = message.get(AssertionInfoMap.class); // extract Assertion information if (aim != null) { AbstractBinding transport = null; @@ -222,16 +216,12 @@ public class PolicyBasedWSS4JOutInterceptor extends AbstractPhaseInterceptor<Soa } } -<<<<<<< HEAD - -======= private boolean hasAttachments(SoapMessage mc) { final Collection<org.apache.cxf.message.Attachment> attachments = mc.getAttachments(); return attachments != null && attachments.size() > 0; } ->>>>>>> 419478e... Add a warning for MTOM for the policy case as well public Set<String> getAfter() { return Collections.emptySet(); }
