Update to use StaxUtils methods wherever possible. (better security handling, better performing, compatible with cxf3)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f00524d8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f00524d8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f00524d8 Branch: refs/heads/master Commit: f00524d825b01c76aa99e69fbfbccb66912825d7 Parents: 0c04f27 Author: Daniel Kulp <dk...@apache.org> Authored: Fri Jan 3 16:58:31 2014 -0500 Committer: Daniel Kulp <dk...@apache.org> Committed: Mon Jan 6 10:14:15 2014 -0500 ---------------------------------------------------------------------- .../apache/camel/component/cxf/DefaultCxfBinding.java | 13 +++++++++++-- .../component/cxf/cxfbean/CxfBeanTransportFactory.java | 5 +++-- .../ConfigureDocLitWrapperInterceptor.java | 7 ++++--- .../cxf/CxfConsumerPayLoadFaultMessageTest.java | 3 ++- .../cxf/CxfConsumerPayLoadMarshalFaultTest.java | 3 ++- .../component/cxf/CxfConsumerPayloadFaultTest.java | 3 ++- .../apache/camel/component/cxf/CxfEndpointTest.java | 7 ++++--- .../camel/component/cxf/CxfMixedModeRouterTest.java | 5 +++-- .../org/apache/camel/component/cxf/SoapTargetBean.java | 5 +++-- .../cxf/mtom/CxfMtomConsumerPayloadModeTest.java | 6 +++--- .../mtom/CxfMtomDisabledConsumerPayloadModeTest.java | 5 ++--- .../mtom/CxfMtomDisabledProducerPayloadModeTest.java | 3 ++- .../cxf/mtom/CxfMtomProducerPayloadModeTest.java | 3 ++- .../cxf/soap/headers/CxfMessageHeadersRelayTest.java | 13 ++++++------- 14 files changed, 49 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f00524d8/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java index a595484..2657508 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java @@ -60,7 +60,6 @@ import org.apache.cxf.headers.Header; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.helpers.HttpHeaderHelper; -import org.apache.cxf.helpers.XMLUtils; import org.apache.cxf.jaxws.context.WrappedMessageContext; import org.apache.cxf.message.Attachment; import org.apache.cxf.message.Message; @@ -72,6 +71,7 @@ import org.apache.cxf.service.model.BindingMessageInfo; import org.apache.cxf.service.model.BindingOperationInfo; import org.apache.cxf.service.model.MessagePartInfo; import org.apache.cxf.service.model.OperationInfo; +import org.apache.cxf.staxutils.StaxUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -793,7 +793,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware if (LOG.isTraceEnabled()) { LOG.trace("Extract body element {}", - element == null ? "null" : XMLUtils.toString(element)); + element == null ? "null" : getXMLString(element)); } } else if (part instanceof Element) { addNamespace((Element)part, nsMap); @@ -807,6 +807,15 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware return answer; } + + private static String getXMLString(Element el) { + try { + return StaxUtils.toString(el); + } catch (Throwable t) { + //ignore + } + return "unknown content"; + } public static Object getBodyFromCamel(org.apache.camel.Message out, DataFormat dataFormat) { http://git-wip-us.apache.org/repos/asf/camel/blob/f00524d8/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java index fbf8a4d..485de03 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java @@ -19,6 +19,7 @@ package org.apache.camel.component.cxf.cxfbean; import java.io.IOException; import org.apache.camel.component.cxf.transport.CamelTransportFactory; +import org.apache.cxf.Bus; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.transport.Destination; import org.slf4j.Logger; @@ -36,12 +37,12 @@ public class CxfBeanTransportFactory extends CamelTransportFactory { private CxfBeanComponent cxfBeanComponent; @Override - public Destination getDestination(EndpointInfo endpointInfo) throws IOException { + public Destination getDestination(EndpointInfo endpointInfo, Bus b) throws IOException { LOG.debug("Create CxfBeanDestination: {}", endpointInfo); // lookup endpoint from component instead of CamelContext because it may not // be added to the CamelContext yet. - return new CxfBeanDestination(cxfBeanComponent, getBus(), this, endpointInfo); + return new CxfBeanDestination(cxfBeanComponent, b, this, endpointInfo); } public void setCxfBeanComponent(CxfBeanComponent cxfBeanComponent) { http://git-wip-us.apache.org/repos/asf/camel/blob/f00524d8/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/ConfigureDocLitWrapperInterceptor.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/ConfigureDocLitWrapperInterceptor.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/ConfigureDocLitWrapperInterceptor.java index 3873d5e..3ad2b04 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/ConfigureDocLitWrapperInterceptor.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/ConfigureDocLitWrapperInterceptor.java @@ -17,7 +17,6 @@ package org.apache.camel.component.cxf.interceptors; import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor; -import org.apache.cxf.interceptor.DocLiteralInInterceptor; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.message.Message; import org.apache.cxf.phase.Phase; @@ -33,12 +32,14 @@ public class ConfigureDocLitWrapperInterceptor extends AbstractInDatabindingInte public ConfigureDocLitWrapperInterceptor(boolean unwrapParameterFlag) { super(Phase.UNMARSHAL); - addBefore(DocLiteralInInterceptor.class.getName()); + addBefore("org.apache.cxf.interceptor.DocLiteralInInterceptor"); + addBefore("org.apache.cxf.wsdl.interceptors.DocLiteralInInterceptor"); this.unwrapParameterFlag = unwrapParameterFlag; } public void handleMessage(Message message) throws Fault { - message.put(DocLiteralInInterceptor.KEEP_PARAMETERS_WRAPPER, unwrapParameterFlag); + message.put("org.apache.cxf.interceptor.DocLiteralInInterceptor.DocLiteralInInterceptor.keep-parameters-wrapper", unwrapParameterFlag); + message.put("org.apache.cxf.wsdl.interceptors.DocLiteralInInterceptor.DocLiteralInInterceptor.keep-parameters-wrapper", unwrapParameterFlag); } public boolean isUnwrapParameterFlag() { http://git-wip-us.apache.org/repos/asf/camel/blob/f00524d8/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java index 3668db8..0454737 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java @@ -27,6 +27,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.cxf.binding.soap.SoapHeader; import org.apache.cxf.helpers.DOMUtils; +import org.apache.cxf.staxutils.StaxUtils; // SET the fault message directly on the out message public class CxfConsumerPayLoadFaultMessageTest extends CxfConsumerPayloadFaultTest { @@ -41,7 +42,7 @@ public class CxfConsumerPayLoadFaultMessageTest extends CxfConsumerPayloadFaultT public void configure() { from(fromURI).process(new Processor() { public void process(final Exchange exchange) throws Exception { - Element details = DOMUtils.readXml(new StringReader(FAULTS)).getDocumentElement(); + Element details = StaxUtils.read(new StringReader(FAULTS)).getDocumentElement(); List<Element> outElements = new ArrayList<Element>(); outElements.add(details); CxfPayload<SoapHeader> responsePayload = new CxfPayload<SoapHeader>(null, outElements); http://git-wip-us.apache.org/repos/asf/camel/blob/f00524d8/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadMarshalFaultTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadMarshalFaultTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadMarshalFaultTest.java index 69e6fbf..e89099b 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadMarshalFaultTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadMarshalFaultTest.java @@ -29,6 +29,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.wsdl_first.types.UnknownPersonFault; import org.apache.cxf.binding.soap.SoapFault; import org.apache.cxf.helpers.DOMUtils; +import org.apache.cxf.staxutils.StaxUtils; @@ -45,7 +46,7 @@ public class CxfConsumerPayLoadMarshalFaultTest extends CxfConsumerPayloadFaultT JAXBContext context = JAXBContext.newInstance("org.apache.camel.wsdl_first.types"); QName faultCode = new QName("http://schemas.xmlsoap.org/soap/envelope/";, "Server"); SoapFault fault = new SoapFault("Get the null value of person name", faultCode); - Element details = DOMUtils.readXml(new StringReader(DETAILS)).getDocumentElement(); + Element details = StaxUtils.read(new StringReader(DETAILS)).getDocumentElement(); UnknownPersonFault unknowPersonFault = new UnknownPersonFault(); unknowPersonFault.setPersonId(""); context.createMarshaller().marshal(unknowPersonFault, details); http://git-wip-us.apache.org/repos/asf/camel/blob/f00524d8/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java index 84fcde8..629e3f9 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java @@ -39,6 +39,7 @@ import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.interceptor.LoggingInInterceptor; import org.apache.cxf.interceptor.LoggingOutInterceptor; +import org.apache.cxf.staxutils.StaxUtils; import org.junit.Test; @@ -77,7 +78,7 @@ public class CxfConsumerPayloadFaultTest extends CamelTestSupport { public void process(final Exchange exchange) throws Exception { QName faultCode = new QName("http://schemas.xmlsoap.org/soap/envelope/";, "Server"); SoapFault fault = new SoapFault("Get the null value of person name", faultCode); - Element details = DOMUtils.readXml(new StringReader(DETAILS)).getDocumentElement(); + Element details = StaxUtils.read(new StringReader(DETAILS)).getDocumentElement(); fault.setDetail(details); exchange.setException(fault); http://git-wip-us.apache.org/repos/asf/camel/blob/f00524d8/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfEndpointTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfEndpointTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfEndpointTest.java index f1a7cf3..7868403 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfEndpointTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfEndpointTest.java @@ -24,8 +24,9 @@ import org.apache.camel.component.cxf.CxfEndpoint.CamelCxfClientImpl; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.SimpleRegistry; import org.apache.camel.spring.SpringCamelContext; +import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; -import org.apache.cxf.bus.CXFBusImpl; +import org.apache.cxf.bus.extension.ExtensionManagerBus; import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory; import org.easymock.EasyMock; import org.junit.Assert; @@ -67,11 +68,11 @@ public class CxfEndpointTest extends Assert { @Test public void testSettingClientBus() throws Exception { - CXFBusImpl bus = (CXFBusImpl) BusFactory.newInstance().createBus(); + ExtensionManagerBus bus = (ExtensionManagerBus) BusFactory.newInstance().createBus(); bus.setId("oldCXF"); BusFactory.setThreadDefaultBus(bus); - CXFBusImpl newBus = (CXFBusImpl) BusFactory.newInstance().createBus(); + ExtensionManagerBus newBus = (ExtensionManagerBus) BusFactory.newInstance().createBus(); newBus.setId("newCXF"); CxfComponent cxfComponent = new CxfComponent(new DefaultCamelContext()); CxfEndpoint endpoint = (CxfEndpoint)cxfComponent.createEndpoint(routerEndpointURI); http://git-wip-us.apache.org/repos/asf/camel/blob/f00524d8/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java index 7ad3b82..017730c 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java @@ -17,6 +17,7 @@ package org.apache.camel.component.cxf; +import java.io.StringReader; import java.util.ArrayList; import java.util.List; @@ -36,7 +37,7 @@ import org.apache.cxf.endpoint.Server; import org.apache.cxf.frontend.ClientFactoryBean; import org.apache.cxf.frontend.ClientProxyFactoryBean; import org.apache.cxf.frontend.ServerFactoryBean; -import org.apache.cxf.helpers.XMLUtils; +import org.apache.cxf.staxutils.StaxUtils; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -121,7 +122,7 @@ public class CxfMixedModeRouterTest extends CamelTestSupport { + list.get(0) + "</return></ns1:echoResponse>"; List<Element> body = new ArrayList<Element>(); - body.add(XMLUtils.parse(s).getDocumentElement()); + body.add(StaxUtils.read(new StringReader(s)).getDocumentElement()); message = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(), body); } http://git-wip-us.apache.org/repos/asf/camel/blob/f00524d8/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java index e268233..16ba0a5 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java @@ -26,7 +26,8 @@ import javax.xml.soap.SOAPMessage; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.apache.cxf.helpers.XMLUtils; +import org.apache.cxf.staxutils.StaxUtils; + public class SoapTargetBean { private static QName sayHi = new QName("http://apache.org/hello_world_soap_http/types";, "sayHi"); @@ -83,7 +84,7 @@ public class SoapTargetBean { public SOAPMessage invokeStream(InputStream in) { SOAPMessage response = null; try { - Document doc = XMLUtils.parse(in); + Document doc = StaxUtils.read(in); if (doc.getElementsByTagNameNS(greetMe.getNamespaceURI(), sayHi.getLocalPart()).getLength() == 1) { response = sayHiResponse; http://git-wip-us.apache.org/repos/asf/camel/blob/f00524d8/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java index 77e4c8b..3cc587e 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java @@ -41,11 +41,11 @@ import org.apache.cxf.binding.soap.SoapHeader; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.helpers.XPathUtils; +import org.apache.cxf.staxutils.StaxUtils; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; - import static org.junit.Assert.assertEquals; @@ -73,7 +73,7 @@ public class CxfMtomConsumerPayloadModeTest extends AbstractJUnit4SpringContextT exchange.setPattern(ExchangePattern.InOut); assertEquals("Get a wrong Content-Type header", "application/xop+xml", exchange.getIn().getHeader("Content-Type")); List<Source> elements = new ArrayList<Source>(); - elements.add(new DOMSource(DOMUtils.readXml(new StringReader(getRequestMessage())).getDocumentElement())); + elements.add(new DOMSource(StaxUtils.read(new StringReader(getRequestMessage())).getDocumentElement())); CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(), elements, null); exchange.getIn().setBody(body); @@ -122,7 +122,7 @@ public class CxfMtomConsumerPayloadModeTest extends AbstractJUnit4SpringContextT // create response List<Source> elements = new ArrayList<Source>(); - elements.add(new DOMSource(DOMUtils.readXml(new StringReader(MtomTestHelper.RESP_MESSAGE)).getDocumentElement())); + elements.add(new DOMSource(StaxUtils.read(new StringReader(MtomTestHelper.RESP_MESSAGE)).getDocumentElement())); CxfPayload<SoapHeader> sbody = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(), elements, null); exchange.getOut().setBody(sbody); http://git-wip-us.apache.org/repos/asf/camel/blob/f00524d8/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java index 7b37162..fd8798a 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java @@ -32,9 +32,8 @@ import org.apache.camel.component.cxf.CxfPayload; import org.apache.cxf.binding.soap.SoapHeader; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.helpers.IOUtils; - +import org.apache.cxf.staxutils.StaxUtils; import org.junit.Assert; - import org.springframework.test.context.ContextConfiguration; /** @@ -71,7 +70,7 @@ public class CxfMtomDisabledConsumerPayloadModeTest extends CxfMtomConsumerPaylo // create response List<Source> elements = new ArrayList<Source>(); - elements.add(new DOMSource(DOMUtils.readXml(new StringReader(MtomTestHelper.MTOM_DISABLED_RESP_MESSAGE)).getDocumentElement())); + elements.add(new DOMSource(StaxUtils.read(new StringReader(MtomTestHelper.MTOM_DISABLED_RESP_MESSAGE)).getDocumentElement())); CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(), elements, null); exchange.getOut().setBody(body); http://git-wip-us.apache.org/repos/asf/camel/blob/f00524d8/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java index 754c434..d4e44af 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java @@ -46,6 +46,7 @@ import org.apache.cxf.binding.soap.SoapHeader; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.helpers.IOUtils; +import org.apache.cxf.staxutils.StaxUtils; import org.junit.Assert; import org.springframework.test.context.ContextConfiguration; @@ -81,7 +82,7 @@ public class CxfMtomDisabledProducerPayloadModeTest extends CxfMtomProducerPaylo public void process(Exchange exchange) throws Exception { exchange.setPattern(ExchangePattern.InOut); List<Source> elements = new ArrayList<Source>(); - elements.add(new DOMSource(DOMUtils.readXml(new StringReader(MtomTestHelper.MTOM_DISABLED_REQ_MESSAGE)).getDocumentElement())); + elements.add(new DOMSource(StaxUtils.read(new StringReader(MtomTestHelper.MTOM_DISABLED_REQ_MESSAGE)).getDocumentElement())); CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(), elements, null); exchange.getIn().setBody(body); http://git-wip-us.apache.org/repos/asf/camel/blob/f00524d8/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java index ec05b5d..685b276 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java @@ -45,6 +45,7 @@ import org.apache.cxf.binding.soap.SoapHeader; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.helpers.XPathUtils; +import org.apache.cxf.staxutils.StaxUtils; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -96,7 +97,7 @@ public class CxfMtomProducerPayloadModeTest extends AbstractJUnit4SpringContextT public void process(Exchange exchange) throws Exception { exchange.setPattern(ExchangePattern.InOut); List<Source> elements = new ArrayList<Source>(); - elements.add(new DOMSource(DOMUtils.readXml(new StringReader(MtomTestHelper.REQ_MESSAGE)).getDocumentElement())); + elements.add(new DOMSource(StaxUtils.read(new StringReader(MtomTestHelper.REQ_MESSAGE)).getDocumentElement())); CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(), elements, null); exchange.getIn().setBody(body); http://git-wip-us.apache.org/repos/asf/camel/blob/f00524d8/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java index c05e01b..6c3f0dd 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java @@ -55,17 +55,16 @@ import org.apache.cxf.headers.Header; import org.apache.cxf.headers.Header.Direction; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.helpers.DOMUtils; -import org.apache.cxf.helpers.XMLUtils; import org.apache.cxf.jaxb.JAXBDataBinding; import org.apache.cxf.message.MessageContentsList; import org.apache.cxf.outofband.header.OutofBandHeader; +import org.apache.cxf.staxutils.StaxUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -416,10 +415,10 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests String requestBody = "<ns2:inoutHeader xmlns:ns2=\"http://apache.org/camel/component/cxf/soap/headers\";>" + "<requestType>CXF user</requestType></ns2:inoutHeader>"; List<Source> elements = new ArrayList<Source>(); - elements.add(new DOMSource(DOMUtils.readXml(new StringReader(requestBody)).getDocumentElement())); + elements.add(new DOMSource(StaxUtils.read(new StringReader(requestBody)).getDocumentElement())); final List<SoapHeader> headers = new ArrayList<SoapHeader>(); headers.add(new SoapHeader(qname, - DOMUtils.readXml(new StringReader(requestHeader)).getDocumentElement())); + StaxUtils.read(new StringReader(requestHeader)).getDocumentElement())); final CxfPayload<SoapHeader> cxfPayload = new CxfPayload<SoapHeader>(headers, elements, null); Exchange exchange = template.request(uri, new Processor() { @@ -441,7 +440,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests String responseExp = "<ns2:inoutHeaderResponse xmlns:ns2=\"http://apache.org/camel/"; + "component/cxf/soap/headers\"><responseType>pass</responseType>" + "</ns2:inoutHeaderResponse>"; - String response = XMLUtils.toString(out.getBody().get(0)); + String response = StaxUtils.toString(out.getBody().get(0)); assertTrue(response, response.contains(responseExp)); } @@ -704,7 +703,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests + "<name>New_testOobHeader</name><value>New_testOobHeaderValue</value></outofbandHeader>"; SoapHeader newHeader = new SoapHeader(soapHeaders.get(0).getName(), - DOMUtils.readXml(new StringReader(xml)).getDocumentElement()); + StaxUtils.read(new StringReader(xml)).getDocumentElement()); // make sure direction is IN since it is a request message. newHeader.setDirection(Direction.DIRECTION_IN); //newHeader.setMustUnderstand(false); @@ -732,7 +731,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests + "xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"; soap:mustUnderstand=\"1\">" + "<name>New_testOobHeader</name><value>New_testOobHeaderValue</value></outofbandHeader>"; SoapHeader newHeader = new SoapHeader(soapHeaders.get(0).getName(), - DOMUtils.readXml(new StringReader(xml)).getDocumentElement()); + StaxUtils.read(new StringReader(xml)).getDocumentElement()); // make sure direction is OUT since it is a response message. newHeader.setDirection(Direction.DIRECTION_OUT); //newHeader.setMustUnderstand(false);
