Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 679E9200B52 for ; Mon, 25 Jul 2016 17:30:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 665E4160A9F; Mon, 25 Jul 2016 15:30:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B94F1160A8F for ; Mon, 25 Jul 2016 17:30:36 +0200 (CEST) Received: (qmail 69341 invoked by uid 500); 25 Jul 2016 15:30:35 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 69062 invoked by uid 99); 25 Jul 2016 15:30:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jul 2016 15:30:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 73393E5CE0; Mon, 25 Jul 2016 15:30:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Mon, 25 Jul 2016 15:30:37 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/14] cxf git commit: [CXF-6900] Get Colm's tests working.... archived-at: Mon, 25 Jul 2016 15:30:37 -0000 [CXF-6900] Get Colm's tests working.... Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/40428e41 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/40428e41 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/40428e41 Branch: refs/heads/3.0.x-fixes Commit: 40428e414a8a724b10ea68b9d7a06e656fd1b867 Parents: 807d2ac Author: Daniel Kulp Authored: Tue May 17 12:13:14 2016 -0400 Committer: Daniel Kulp Committed: Mon Jul 25 10:16:42 2016 -0400 ---------------------------------------------------------------------- .../cxf/binding/soap/saaj/SAAJStreamWriter.java | 4 ++++ .../apache/cxf/binding/soap/saaj/ParseBodyTest.java | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/40428e41/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java ---------------------------------------------------------------------- diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java index 14b5c2e..d29276c 100644 --- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java +++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java @@ -52,6 +52,9 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter { if (namespace != null && namespace.equals(part.getEnvelope().getElementName().getURI())) { adjustPrefix((SOAPElement)nd2, pfx); + if ("Envelope".equals(nd2.getLocalName())) { + adjustPrefix(part.getEnvelope().getHeader(), pfx); + } } } catch (SOAPException e) { //ignore, fallback @@ -146,6 +149,7 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter { el = ((SOAPElement)cur).addChildElement(local, "", ""); } else { el = ((SOAPElement)cur).addChildElement(local, pfx == null ? "" : pfx, ns); + adjustPrefix((SOAPElement)el, pfx); } cur.removeChild(el); return el; http://git-wip-us.apache.org/repos/asf/cxf/blob/40428e41/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java ---------------------------------------------------------------------- diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java index bcdb6f9..1f6eeb4 100644 --- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java +++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java @@ -30,6 +30,7 @@ import javax.xml.soap.SOAPMessage; import javax.xml.soap.SOAPPart; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; +import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import org.w3c.dom.Document; @@ -39,6 +40,7 @@ import org.apache.cxf.helpers.DOMUtils.NullResolver; import org.apache.cxf.message.Exchange; import org.apache.cxf.message.ExchangeImpl; import org.apache.cxf.message.MessageImpl; +import org.apache.cxf.staxutils.StaxSource; import org.apache.cxf.staxutils.StaxUtils; import org.junit.Assert; import org.junit.Test; @@ -87,26 +89,30 @@ public class ParseBodyTest extends Assert { // TODO - See CXF-6900 @Test - @org.junit.Ignore public void testReadSOAPFault() throws Exception { InputStream inStream = getClass().getResourceAsStream("soap12-fault.xml"); Document doc = StaxUtils.read(inStream); - + SoapMessage msg = new SoapMessage(new MessageImpl()); Exchange ex = new ExchangeImpl(); ex.setInMessage(msg); SOAPMessage saajMsg = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL).createMessage(); SOAPPart part = saajMsg.getSOAPPart(); - part.setContent(new DOMSource(doc)); + SAAJStreamWriter writer = new SAAJStreamWriter(part); + StaxUtils.copy(doc, writer); + //Source s = new StaxSource(StaxUtils.createXMLStreamReader(doc)); + //part.setContent(s); saajMsg.saveChanges(); - + msg.setContent(SOAPMessage.class, saajMsg); doc = part; // System.out.println("OUTPUT: " + StaxUtils.toString(doc)); byte[] docbytes = getMessageBytes(doc); + + // System.out.println("OUTPUT: " + new String(docbytes)); XMLStreamReader reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(docbytes)); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();