Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4bdd188b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4bdd188b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4bdd188b Branch: refs/heads/3.0.x-fixes Commit: 4bdd188b4b1caa5589afc639a0896dae307d277f Parents: 5101c85 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Thu Apr 16 11:07:12 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Thu Apr 16 11:07:12 2015 +0100 ---------------------------------------------------------------------- .../cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java | 8 +------- .../wss4j/policyhandlers/AbstractBindingBuilder.java | 7 +------ 2 files changed, 2 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/4bdd188b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java index 8ab2a82..de1de0b 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java @@ -72,15 +72,9 @@ public abstract class AbstractWSS4JStaxInterceptor implements SoapInterceptor, private static final Set<QName> HEADERS = new HashSet<QName>(); static { -<<<<<<< HEAD HEADERS.add(new QName(WSSConstants.NS_WSSE10, "Security")); - HEADERS.add(new QName(WSSConstants.NS_WSSE11, "Security")); HEADERS.add(new QName(WSSConstants.NS_XMLENC, "EncryptedData")); -======= - HEADERS.add(new QName(WSConstants.WSSE_NS, "Security")); - HEADERS.add(new QName(WSConstants.ENC_NS, "EncryptedData")); - HEADERS.add(new QName(WSConstants.WSSE11_NS, "EncryptedHeader")); ->>>>>>> 5b20a3c... [CXF-6343] - EncryptedHeader not properly processed or generated. This closes #66 + HEADERS.add(new QName(WSSConstants.NS_WSSE11, "EncryptedHeader")); } private static final Logger LOG = LogUtils.getL7dLogger(AbstractWSS4JStaxInterceptor.class); http://git-wip-us.apache.org/repos/asf/cxf/blob/4bdd188b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java index 191de5f..ce1f72a 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java @@ -1055,13 +1055,8 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle for (Header head : parts.getHeaders()) { WSEncryptionPart wep = new WSEncryptionPart(head.getName(), head.getNamespace(), -<<<<<<< HEAD - "Element"); - signedParts.add(wep); -======= "Header"); - securedParts.add(wep); ->>>>>>> 5b20a3c... [CXF-6343] - EncryptedHeader not properly processed or generated. This closes #66 + signedParts.add(wep); } Attachments attachments = parts.getAttachments();
