You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/10/17 05:04:40 UTC
svn commit: r1184983 - in /camel/trunk/components/camel-cxf/src:
main/java/org/apache/camel/component/cxf/
main/java/org/apache/camel/component/cxf/converter/
test/java/org/apache/camel/component/cxf/
test/java/org/apache/camel/component/cxf/converter/...
Author: dkulp
Date: Mon Oct 17 03:04:40 2011
New Revision: 1184983
URL: http://svn.apache.org/viewvc?rev=1184983&view=rev
Log:
Restore API compatibility of CxfPayload
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java Mon Oct 17 03:04:40 2011
@@ -794,7 +794,7 @@ public class CxfEndpoint extends Default
if (DataFormat.PAYLOAD == message.get(DataFormat.class)) {
CxfPayload<?> payload = (CxfPayload<?>) params[0];
- List<Source> elements = payload.getBody();
+ List<Source> elements = payload.getBodySources();
BindingOperationInfo boi = message.get(BindingOperationInfo.class);
MessageContentsList content = new MessageContentsList();
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java Mon Oct 17 03:04:40 2011
@@ -16,12 +16,20 @@
*/
package org.apache.camel.component.cxf;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import javax.xml.XMLConstants;
import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
+import javax.xml.transform.dom.DOMSource;
+
import org.w3c.dom.Element;
+
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.converter.jaxp.XmlConverter;
+import org.apache.cxf.staxutils.StaxUtils;
/**
@@ -33,13 +41,55 @@ public class CxfPayload<T> {
private List<Source> body;
private List<T> headers;
-
- public CxfPayload(List<T> headers, List<Source> body) {
+ private Map<String, String> nsMap;
+
+ public CxfPayload(List<T> headers, List<Source> body, Map<String, String> nsMap) {
this.headers = headers;
this.body = body;
+ this.nsMap = nsMap;
+ }
+ public CxfPayload(List<T> headers, List<Element> body) {
+ this.headers = headers;
+ this.body = new ArrayList<Source>(body.size());
+ for (Element el : body) {
+ this.body.add(new DOMSource(el));
+ }
+ }
+
+ /**
+ * Get the body as a List of DOM elements.
+ * This will cause the Body to be fully read and parsed.
+ * @return
+ */
+ public List<Element> getBody() {
+ List<Element> els = new ArrayList<Element>();
+ for (int x = 0; x < body.size(); x++) {
+ Source s = body.get(x);
+ try {
+ Element el = StaxUtils.read(s).getDocumentElement();
+ addNamespace(el, nsMap);
+ els.add(el);
+ body.set(x, new DOMSource(el));
+ } catch (Exception ex) {
+ throw new RuntimeCamelException("Problem converting content to Element", ex);
+ }
+ }
+ return els;
}
- public List<Source> getBody() {
+ protected static void addNamespace(Element element, Map<String, String> nsMap) {
+ if (nsMap != null) {
+ for (String ns : nsMap.keySet()) {
+ element.setAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + ns, nsMap.get(ns));
+ }
+ }
+ }
+
+ /**
+ * Gets the body as a List of source objects
+ * @return
+ */
+ public List<Source> getBodySources() {
return body;
}
@@ -57,7 +107,7 @@ public class CxfPayload<T> {
buf.append("body: " + body);
} else {
buf.append("body: [ ");
- for (Source src : body) {
+ for (Element src : getBody()) {
String elementString = "";
try {
elementString = converter.toString(src, null);
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java Mon Oct 17 03:04:40 2011
@@ -315,7 +315,7 @@ public class DefaultCxfBinding implement
if (outBody != null) {
if (dataFormat == DataFormat.PAYLOAD) {
CxfPayload<?> payload = (CxfPayload<?>)outBody;
- outMessage.setContent(List.class, getResponsePayloadList(cxfExchange, payload.getBody()));
+ outMessage.setContent(List.class, getResponsePayloadList(cxfExchange, payload.getBodySources()));
outMessage.put(Header.HEADER_LIST, payload.getHeaders());
} else {
if (responseContext.get(Header.HEADER_LIST) != null) {
@@ -612,7 +612,8 @@ public class DefaultCxfBinding implement
}
} else if (dataFormat == DataFormat.PAYLOAD) {
List<SoapHeader> headers = CastUtils.cast((List<?>)message.get(Header.HEADER_LIST));
- answer = new CxfPayload<SoapHeader>(headers, getPayloadBodyElements(message));
+ Map<String, String> nsMap = new HashMap<String, String>();
+ answer = new CxfPayload<SoapHeader>(headers, getPayloadBodyElements(message, nsMap), nsMap);
} else if (dataFormat == DataFormat.MESSAGE) {
answer = message.getContent(InputStream.class);
@@ -630,10 +631,9 @@ public class DefaultCxfBinding implement
}
- protected static List<Source> getPayloadBodyElements(Message message) {
+ protected static List<Source> getPayloadBodyElements(Message message, Map<String, String> nsMap) {
// take the namespace attribute from soap envelop
Document soapEnv = (Document) message.getContent(Node.class);
- Map<String, String> nsMap = new HashMap<String, String>();
if (soapEnv != null) {
NamedNodeMap attrs = soapEnv.getFirstChild().getAttributes();
for (int i = 0; i < attrs.getLength(); i++) {
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java Mon Oct 17 03:04:40 2011
@@ -53,20 +53,20 @@ public final class CxfPayloadConverter {
@Converter
public static <T> CxfPayload<T> elementToCxfPayload(Element element, Exchange exchange) {
List<T> headers = new ArrayList<T>();
- List<Source> body = new ArrayList<Source>();
- body.add(new DOMSource(element));
+ List<Element> body = new ArrayList<Element>();
+ body.add(element);
return new CxfPayload<T>(headers, body);
}
@Converter
public static <T> CxfPayload<T> nodeListToCxfPayload(NodeList nodeList, Exchange exchange) {
List<T> headers = new ArrayList<T>();
- List<Source> body = new ArrayList<Source>();
+ List<Element> body = new ArrayList<Element>();
for (int i = 0; i < nodeList.getLength(); i++) {
Node node = nodeList.item(i);
// add all nodes to the body that are elements
if (Element.class.isAssignableFrom(node.getClass())) {
- body.add(new DOMSource((Element) node));
+ body.add((Element) node);
}
}
return new CxfPayload<T>(headers, body);
@@ -74,33 +74,12 @@ public final class CxfPayloadConverter {
@Converter
public static <T> NodeList cxfPayloadToNodeList(CxfPayload<T> payload, Exchange exchange) {
- return new NodeListWrapper(convertToElementList(payload.getBody()));
- }
-
- private static List<Element> convertToElementList(List<Source> srcs) {
- List<Element> ret = new ArrayList<Element>();
- for (int x = 0; x < srcs.size(); x++) {
- Source src = srcs.get(x);
- Element el = null;
- if (src instanceof DOMSource) {
- el = (Element)((DOMSource)src).getNode();
- } else {
- try {
- Document doc = StaxUtils.read(src);
- el = doc.getDocumentElement();
- } catch (XMLStreamException e) {
- throw new RuntimeCamelException("Could not convert from Source to Element.", e);
- }
- srcs.set(0, new DOMSource(el));
- }
- ret.add(el);
- }
- return ret;
+ return new NodeListWrapper(payload.getBody());
}
@Converter
public static <T> Node cxfPayLoadToNode(CxfPayload<T> payload, Exchange exchange) {
- List<Element> payloadBodyElements = convertToElementList(payload.getBody());
+ List<Element> payloadBodyElements = payload.getBody();
if (payloadBodyElements.size() > 0) {
return payloadBodyElements.get(0);
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java Mon Oct 17 03:04:40 2011
@@ -45,8 +45,8 @@ public class CxfConsumerPayLoadFaultMess
from(fromURI).process(new Processor() {
public void process(final Exchange exchange) throws Exception {
Element details = DOMUtils.readXml(new StringReader(FAULTS)).getDocumentElement();
- List<Source> outElements = new ArrayList<Source>();
- outElements.add(new DOMSource(details));
+ List<Element> outElements = new ArrayList<Element>();
+ outElements.add(details);
CxfPayload<SoapHeader> responsePayload = new CxfPayload<SoapHeader>(null, outElements);
exchange.getOut().setBody(responsePayload);
exchange.getOut().setFault(true);
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadTest.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadTest.java Mon Oct 17 03:04:40 2011
@@ -62,7 +62,7 @@ public class CxfConsumerPayloadTest exte
@SuppressWarnings("unchecked")
public void process(final Exchange exchange) throws Exception {
CxfPayload<SoapHeader> requestPayload = exchange.getIn().getBody(CxfPayload.class);
- List<Source> inElements = requestPayload.getBody();
+ List<Source> inElements = requestPayload.getBodySources();
List<Source> outElements = new ArrayList<Source>();
// You can use a customer toStringConverter to turn a CxfPayLoad message into String as you want
String request = exchange.getIn().getBody(String.class);
@@ -84,7 +84,7 @@ public class CxfConsumerPayloadTest exte
Document outDocument = converter.toDOMDocument(documentString);
outElements.add(new DOMSource(outDocument.getDocumentElement()));
// set the payload header with null
- CxfPayload<SoapHeader> responsePayload = new CxfPayload<SoapHeader>(null, outElements);
+ CxfPayload<SoapHeader> responsePayload = new CxfPayload<SoapHeader>(null, outElements, null);
exchange.getOut().setBody(responsePayload);
}
});
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java Mon Oct 17 03:04:40 2011
@@ -123,8 +123,8 @@ public class CxfMixedModeRouterTest exte
+ "<return xmlns=\"http://cxf.component.camel.apache.org/\">"
+ list.get(0)
+ "</return></ns1:echoResponse>";
- List<Source> body = new ArrayList<Source>();
- body.add(new DOMSource(XMLUtils.parse(s).getDocumentElement()));
+ List<Element> body = new ArrayList<Element>();
+ body.add(XMLUtils.parse(s).getDocumentElement());
message = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(), body);
}
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java Mon Oct 17 03:04:40 2011
@@ -45,7 +45,7 @@ public class CxfPayLoadMessageRouterAddr
exchange.getIn().setHeader(Exchange.DESTINATION_OVERRIDE_URL, getServiceAddress());
CxfPayload<?> payload = exchange.getIn().getBody(CxfPayload.class);
- List<Source> elements = payload.getBody();
+ List<Source> elements = payload.getBodySources();
assertNotNull("We should get the elements here" , elements);
assertEquals("Get the wrong elements size" , elements.size(), 1);
Element el = new XmlConverter().toDOMElement(elements.get(0));
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java Mon Oct 17 03:04:40 2011
@@ -43,7 +43,7 @@ public class CxfPayLoadMessageRouterTest
from(routerEndpointURI).process(new Processor() {
public void process(Exchange exchange) throws Exception {
CxfPayload<?> payload = exchange.getIn().getBody(CxfPayload.class);
- List<Source> elements = payload.getBody();
+ List<Source> elements = payload.getBodySources();
assertNotNull("We should get the elements here" , elements);
assertEquals("Get the wrong elements size" , elements.size(), 1);
Element el = new XmlConverter().toDOMElement(elements.get(0));
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java Mon Oct 17 03:04:40 2011
@@ -111,7 +111,7 @@ public class CxfPayLoadMessageXmlBinding
from("cxf:bean:routerEndpoint?dataFormat=PAYLOAD").process(new Processor() {
public void process(Exchange exchange) throws Exception {
CxfPayload<?> payload = exchange.getIn().getBody(CxfPayload.class);
- List<Source> elements = payload.getBody();
+ List<Source> elements = payload.getBodySources();
assertNotNull("We should get the elements here" , elements);
assertEquals("Get the wrong elements size" , elements.size(), 1);
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTest.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTest.java Mon Oct 17 03:04:40 2011
@@ -73,7 +73,7 @@ public class CxfPayLoadSoapHeaderTest ex
@SuppressWarnings("unchecked")
public void process(Exchange exchange) throws Exception {
CxfPayload<SoapHeader> payload = exchange.getIn().getBody(CxfPayload.class);
- List<Source> elements = payload.getBody();
+ List<Source> elements = payload.getBodySources();
assertNotNull("We should get the elements here", elements);
assertEquals("Get the wrong elements size", 1, elements.size());
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java Mon Oct 17 03:04:40 2011
@@ -60,8 +60,8 @@ public class CxfPayloadConverterTest ext
document.getDocumentElement().normalize();
List<Source> body = new ArrayList<Source>();
body.add(new DOMSource(document.getDocumentElement()));
- payload = new CxfPayload<String[]>(new ArrayList<String[]>(), body);
- emptyPayload = new CxfPayload<String[]>(new ArrayList<String[]>(), new ArrayList<Source>());
+ payload = new CxfPayload<String[]>(new ArrayList<String[]>(), body, null);
+ emptyPayload = new CxfPayload<String[]>(new ArrayList<String[]>(), new ArrayList<Source>(), null);
inputStream = new FileInputStream(file);
}
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java Mon Oct 17 03:04:40 2011
@@ -73,7 +73,7 @@ public class CxfMtomConsumerPayloadModeT
List<Source> elements = new ArrayList<Source>();
elements.add(new DOMSource(DOMUtils.readXml(new StringReader(getRequestMessage())).getDocumentElement()));
CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(),
- elements);
+ elements, null);
exchange.getIn().setBody(body);
exchange.getIn().addAttachment(MtomTestHelper.REQ_PHOTO_CID,
new DataHandler(new ByteArrayDataSource(MtomTestHelper.REQ_PHOTO_DATA, "application/octet-stream")));
@@ -122,7 +122,7 @@ public class CxfMtomConsumerPayloadModeT
List<Source> elements = new ArrayList<Source>();
elements.add(new DOMSource(DOMUtils.readXml(new StringReader(MtomTestHelper.RESP_MESSAGE)).getDocumentElement()));
CxfPayload<SoapHeader> sbody = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(),
- elements);
+ elements, null);
exchange.getOut().setBody(sbody);
exchange.getOut().addAttachment(MtomTestHelper.RESP_PHOTO_CID,
new DataHandler(new ByteArrayDataSource(MtomTestHelper.RESP_PHOTO_DATA, "application/octet-stream")));
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java Mon Oct 17 03:04:40 2011
@@ -75,7 +75,7 @@ public class CxfMtomDisabledConsumerPayl
List<Source> elements = new ArrayList<Source>();
elements.add(new DOMSource(DOMUtils.readXml(new StringReader(MtomTestHelper.MTOM_DISABLED_RESP_MESSAGE)).getDocumentElement()));
CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(),
- elements);
+ elements, null);
exchange.getOut().setBody(body);
exchange.getOut().addAttachment(MtomTestHelper.RESP_PHOTO_CID,
new DataHandler(new ByteArrayDataSource(MtomTestHelper.RESP_PHOTO_DATA, "application/octet-stream")));
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java Mon Oct 17 03:04:40 2011
@@ -87,7 +87,7 @@ public class CxfMtomDisabledProducerPayl
List<Source> elements = new ArrayList<Source>();
elements.add(new DOMSource(DOMUtils.readXml(new StringReader(MtomTestHelper.MTOM_DISABLED_REQ_MESSAGE)).getDocumentElement()));
CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(),
- elements);
+ elements, null);
exchange.getIn().setBody(body);
exchange.getIn().addAttachment(MtomTestHelper.REQ_PHOTO_CID,
new DataHandler(new ByteArrayDataSource(MtomTestHelper.REQ_PHOTO_DATA, "application/octet-stream")));
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java Mon Oct 17 03:04:40 2011
@@ -100,7 +100,7 @@ public class CxfMtomProducerPayloadModeT
List<Source> elements = new ArrayList<Source>();
elements.add(new DOMSource(DOMUtils.readXml(new StringReader(MtomTestHelper.REQ_MESSAGE)).getDocumentElement()));
CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(),
- elements);
+ elements, null);
exchange.getIn().setBody(body);
exchange.getIn().addAttachment(MtomTestHelper.REQ_PHOTO_CID,
new DataHandler(new ByteArrayDataSource(MtomTestHelper.REQ_PHOTO_DATA, "application/octet-stream")));
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java?rev=1184983&r1=1184982&r2=1184983&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java Mon Oct 17 03:04:40 2011
@@ -422,7 +422,7 @@ public class CxfMessageHeadersRelayTest
final List<SoapHeader> headers = new ArrayList<SoapHeader>();
headers.add(new SoapHeader(qname,
DOMUtils.readXml(new StringReader(requestHeader)).getDocumentElement()));
- final CxfPayload<SoapHeader> cxfPayload = new CxfPayload<SoapHeader>(headers, elements);
+ final CxfPayload<SoapHeader> cxfPayload = new CxfPayload<SoapHeader>(headers, elements, null);
Exchange exchange = template.request(uri, new Processor() {
public void process(Exchange exchange) throws Exception {
@@ -438,10 +438,11 @@ public class CxfMessageHeadersRelayTest
assertEquals(0, out.getHeaders().size());
- String response = "<ns2:inoutHeaderResponse xmlns:ns2=\"http://apache.org/camel/"
+ String responseExp = "<ns2:inoutHeaderResponse xmlns:ns2=\"http://apache.org/camel/"
+ "component/cxf/soap/headers\"><responseType>pass</responseType>"
+ "</ns2:inoutHeaderResponse>";
- assertEquals(response, XMLUtils.toString(out.getBody().get(0)));
+ String response = XMLUtils.toString(out.getBody().get(0));
+ assertTrue(response, response.contains(responseExp));
}
@Test