Author: dkulp
Date: Sun Oct 16 12:31:30 2011
New Revision: 1184812

URL: http://svn.apache.org/viewvc?rev=1184812&view=rev
Log:
[CAMEL-4548] Change from using DOM elements to Source objects for the
internal representation for camel-cxf.   For straight "proxy" use cases
(from("cxf:...").to("cxf:...)) is allows pure streaming and performance
improves by over 50% for medium sized (~50K) messages and allows passing
of massive messages that would previously cause OOM issues.

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/HybridSourceDataBinding.java
    
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
    
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
    
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -24,6 +24,11 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stax.StAXSource;
 import javax.xml.ws.WebServiceProvider;
 import javax.xml.ws.handler.Handler;
 
@@ -79,6 +84,7 @@ import org.apache.cxf.resource.ResourceR
 import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.MessagePartInfo;
+import org.apache.cxf.staxutils.StaxSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -788,16 +794,22 @@ public class CxfEndpoint extends Default
             if (DataFormat.PAYLOAD == message.get(DataFormat.class)) {
 
                 CxfPayload<?> payload = (CxfPayload<?>) params[0];
-                List<Element> elements = payload.getBody();
+                List<Source> elements = payload.getBody();
 
                 BindingOperationInfo boi = 
message.get(BindingOperationInfo.class);
                 MessageContentsList content = new MessageContentsList();
                 int i = 0;
 
                 for (MessagePartInfo partInfo : 
boi.getInput().getMessageParts()) {
-                    if (elements.size() > i && 
(isSkipPayloadMessagePartCheck() || 
partInfo.getConcreteName().getLocalPart().equals(elements.get(i)
-                                                                               
                                                             .getLocalName()))) 
{
-                        content.put(partInfo, elements.get(i++));
+                    if (elements.size() > i) {
+                        if (isSkipPayloadMessagePartCheck()) {
+                            content.put(partInfo, elements.get(i++));
+                        } else {
+                            String name = findName(elements, i);
+                            if 
(partInfo.getConcreteName().getLocalPart().equals(name)) {
+                                content.put(partInfo, elements.get(i++));
+                            }
+                        }
                     }
                 }
 
@@ -815,6 +827,28 @@ public class CxfEndpoint extends Default
 
             message.remove(DataFormat.class);
         }
+
+        private String findName(List<Source> sources, int i) {
+            Source source = sources.get(i);
+            if (source instanceof DOMSource) {
+                return ((Element)((DOMSource)source).getNode()).getLocalName();
+            } else if (source instanceof StaxSource) {
+                StaxSource s = (StaxSource)source;
+                return s.getXMLStreamReader().getLocalName();
+            } else if (source instanceof StAXSource) {
+                StAXSource s = (StAXSource)source;
+                XMLStreamReader r = s.getXMLStreamReader();
+                if (r.getEventType() != XMLStreamReader.START_ELEMENT) {
+                    try {
+                        r.nextTag();
+                    } catch (XMLStreamException e) {
+                        //ignore
+                    }
+                }
+                return r.getLocalName();
+            }
+            return null;
+        }
     }
     
 

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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -18,6 +18,7 @@ package org.apache.camel.component.cxf;
 
 import java.util.List;
 
+import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
 import org.w3c.dom.Element;
 import org.apache.camel.converter.jaxp.XmlConverter;
@@ -30,15 +31,15 @@ import org.apache.camel.converter.jaxp.X
  */
 public class CxfPayload<T> {
     
-    private List<Element> body;
+    private List<Source> body;
     private List<T> headers;
 
-    public CxfPayload(List<T> headers, List<Element> body) {
+    public CxfPayload(List<T> headers, List<Source> body) {
         this.headers = headers;
         this.body = body;
     }
     
-    public List<Element> getBody() {
+    public List<Source> getBody() {
         return body;
     }
     
@@ -56,12 +57,12 @@ public class CxfPayload<T> {
             buf.append("body: " + body);
         } else {
             buf.append("body: [ ");
-            for (Element element : body) {
+            for (Source src : body) {
                 String elementString = "";
                 try {
-                    elementString = converter.toString(element, null);
+                    elementString = converter.toString(src, null);
                 } catch (TransformerException e) {
-                    elementString = element.toString();
+                    elementString = src.toString();
                 }
                 buf.append("[" + elementString + "]");
             }

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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -379,7 +379,7 @@ public class DefaultCxfBinding implement
     // 
-------------------------------------------------------------------------
     
     protected MessageContentsList 
getResponsePayloadList(org.apache.cxf.message.Exchange exchange, 
-                                                         List<Element> 
elements) {
+                                                         List<Source> 
elements) {
         BindingOperationInfo boi = exchange.getBindingOperationInfo();
 
         if (boi.isUnwrapped()) {
@@ -630,7 +630,7 @@ public class DefaultCxfBinding implement
                      
     }
 
-    protected static List<Element> getPayloadBodyElements(Message message) {
+    protected static List<Source> getPayloadBodyElements(Message message) {
         // take the namespace attribute from soap envelop
         Document soapEnv = (Document) message.getContent(Node.class);
         Map<String, String> nsMap = new HashMap<String, String>();
@@ -668,7 +668,7 @@ public class DefaultCxfBinding implement
             partInfos = op.getInput().getMessageParts();            
         }
         
-        List<Element> answer = new ArrayList<Element>();
+        List<Source> answer = new ArrayList<Source>();
 
         for (MessagePartInfo partInfo : partInfos) {
             if (!inObjects.hasValue(partInfo)) {
@@ -682,16 +682,16 @@ public class DefaultCxfBinding implement
             }
                         
             if (part instanceof Source) {
-                Element element;
+                Element element = null;
                 if (part instanceof DOMSource) {
                     element = getFirstElement(((DOMSource)part).getNode());
-                } else {
-                    element = getFirstElement((Source)part);
                 }
 
                 if (element != null) {
                     addNamespace(element, nsMap);
-                    answer.add(element);
+                    answer.add(new DOMSource(element));
+                } else {
+                    answer.add((Source)part);
                 }
                 
                 if (LOG.isTraceEnabled()) {
@@ -700,7 +700,7 @@ public class DefaultCxfBinding implement
                 }
             } else if (part instanceof Element) {
                 addNamespace((Element)part, nsMap);
-                answer.add((Element)part);
+                answer.add(new DOMSource((Element)part));
             } else {
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("Unhandled part type '{}'", part.getClass());
@@ -733,14 +733,6 @@ public class DefaultCxfBinding implement
         return DOMUtils.getFirstElement(node);
     }
     
-    private static Element getFirstElement(Source source) {
-        try {
-            return 
((Document)XMLUtils.fromSource(source)).getDocumentElement();
-        } catch (Exception e) {
-            // ignore
-        }
-        return null;
-    }
     
     public void copyJaxWsContext(org.apache.cxf.message.Exchange cxfExchange, 
Map<String, Object> context) {
         if (cxfExchange.getOutMessage() != null) {

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java?rev=1184812&r1=1184811&r2=1184812&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java
 Sun Oct 16 12:31:30 2011
@@ -16,18 +16,30 @@
  */
 package org.apache.camel.component.cxf;
 
+import java.util.logging.Logger;
+
+import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.Source;
+import javax.xml.transform.stax.StAXSource;
 
 import org.w3c.dom.Node;
 
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.databinding.DataReader;
 import org.apache.cxf.databinding.DataWriter;
 import org.apache.cxf.databinding.source.NodeDataReader;
 import org.apache.cxf.databinding.source.NodeDataWriter;
+import org.apache.cxf.databinding.source.SourceDataBinding;
 import org.apache.cxf.databinding.source.XMLStreamDataReader;
 import org.apache.cxf.databinding.source.XMLStreamDataWriter;
+import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.jaxb.JAXBDataBinding;
+import org.apache.cxf.service.model.MessagePartInfo;
+import org.apache.cxf.staxutils.StaxSource;
+import org.apache.cxf.staxutils.StaxUtils;
 
 
 /**
@@ -40,6 +52,8 @@ import org.apache.cxf.jaxb.JAXBDataBindi
  * @version @Revision: 789534 $
  */
 public class HybridSourceDataBinding extends JAXBDataBinding {
+    private static final Logger LOG = 
LogUtils.getL7dLogger(SourceDataBinding.class);
+    
     public HybridSourceDataBinding() {
         super();
     }
@@ -65,7 +79,27 @@ public class HybridSourceDataBinding ext
     @Override
     public <T> DataWriter<T> createWriter(Class<T> cls) {
         if (cls == XMLStreamWriter.class) {
-            return (DataWriter<T>) new XMLStreamDataWriter();
+            return (DataWriter<T>) new XMLStreamDataWriter() {
+
+                public void write(Object obj, MessagePartInfo part, 
XMLStreamWriter output) {
+                    if (obj == null) {
+                        return;
+                    }
+                    if (obj instanceof StaxSource
+                        || obj instanceof StAXSource) {
+                        XMLStreamReader reader = 
StaxUtils.createXMLStreamReader((Source)obj);
+                        try {
+                            StaxUtils.copy(reader, output);
+                            reader.close();
+                        } catch (XMLStreamException e) {
+                            throw new Fault(new 
Message("COULD_NOT_READ_XML_STREAM", LOG), e);
+                        }
+                        return;
+                    }
+                    super.write(obj, part, output);
+                }
+                
+            };
         } else if (cls == Node.class) {
             return (DataWriter<T>) new NodeDataWriter();
         } else {

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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -19,6 +19,11 @@ package org.apache.camel.component.cxf.c
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -30,6 +35,7 @@ import org.apache.camel.FallbackConverte
 import org.apache.camel.TypeConverter;
 import org.apache.camel.component.cxf.CxfPayload;
 import org.apache.camel.spi.TypeConverterRegistry;
+import org.apache.cxf.staxutils.StaxUtils;
 
 @Converter
 public final class CxfPayloadConverter {
@@ -46,20 +52,20 @@ public final class CxfPayloadConverter {
     @Converter
     public static <T> CxfPayload<T> elementToCxfPayload(Element element, 
Exchange exchange) {
         List<T> headers = new ArrayList<T>();
-        List<Element> body = new ArrayList<Element>();
-        body.add(element);
+        List<Source> body = new ArrayList<Source>();
+        body.add(new DOMSource(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<Element> body = new ArrayList<Element>();
+        List<Source> body = new ArrayList<Source>();
         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((Element) node);
+                body.add(new DOMSource((Element) node));
             }
         }
         return new CxfPayload<T>(headers, body);
@@ -67,12 +73,35 @@ public final class CxfPayloadConverter {
 
     @Converter
     public static <T> NodeList cxfPayloadToNodeList(CxfPayload<T> payload, 
Exchange exchange) {
-        return new NodeListWrapper(payload.getBody());
+        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) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                srcs.set(0, new DOMSource(el));
+            }
+            ret.add(el);
+        }
+        return ret;
     }
     
     @Converter
     public static <T> Node cxfPayLoadToNode(CxfPayload<T> payload, Exchange 
exchange) {
-        List<Element> payloadBodyElements = payload.getBody();
+        List<Element> payloadBodyElements = 
convertToElementList(payload.getBody());
+        
         if (payloadBodyElements.size() > 0) {
             return payloadBodyElements.get(0);
         }

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java?rev=1184812&r1=1184811&r2=1184812&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
 Sun Oct 16 12:31:30 2011
@@ -75,4 +75,13 @@ public abstract class AbstractDataFormat
             }
         }
     }
+    
+    protected void removeInterceptor(List<Interceptor<? extends Message>> 
interceptors, 
+                                     Class<? extends Interceptor> cls) {
+        for (Interceptor interceptor : interceptors) {
+            if (interceptor.getClass().equals(cls)) {
+                interceptors.remove(interceptor);
+            }
+        }        
+    }
 }

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java?rev=1184812&r1=1184811&r2=1184812&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
 Sun Oct 16 12:31:30 2011
@@ -18,15 +18,21 @@ package org.apache.camel.component.cxf.f
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
 
 import 
org.apache.camel.component.cxf.interceptors.ConfigureDocLitWrapperInterceptor;
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.Binding;
+import org.apache.cxf.binding.soap.interceptor.SoapHeaderInterceptor;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.interceptor.ClientFaultConverter;
+import org.apache.cxf.jaxws.interceptors.HolderInInterceptor;
+import org.apache.cxf.jaxws.interceptors.HolderOutInterceptor;
 import org.apache.cxf.service.model.BindingMessageInfo;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.MessageInfo;
@@ -50,6 +56,11 @@ public class PayLoadDataFormatFeature ex
     @Override
     public void initialize(Client client, Bus bus) {
         removeFaultInInterceptorFromClient(client);
+        
+        removeInterceptor(client.getEndpoint().getInInterceptors(), 
+                          HolderInInterceptor.class);
+        
removeInterceptor(client.getEndpoint().getBinding().getInInterceptors(), 
+                          SoapHeaderInterceptor.class);
         client.getEndpoint().getBinding().getInInterceptors().add(new 
ConfigureDocLitWrapperInterceptor(true));
         resetPartTypes(client.getEndpoint().getBinding());
     }
@@ -58,6 +69,12 @@ public class PayLoadDataFormatFeature ex
     @Override
     public void initialize(Server server, Bus bus) {
         server.getEndpoint().getBinding().getInInterceptors().add(new 
ConfigureDocLitWrapperInterceptor(true));
+        removeInterceptor(server.getEndpoint().getInInterceptors(), 
+                          HolderInInterceptor.class);
+        removeInterceptor(server.getEndpoint().getOutInterceptors(), 
+                          HolderOutInterceptor.class);
+        
removeInterceptor(server.getEndpoint().getBinding().getInInterceptors(), 
+                          SoapHeaderInterceptor.class);
         resetPartTypes(server.getEndpoint().getBinding());
     }
 
@@ -91,16 +108,28 @@ public class PayLoadDataFormatFeature ex
     
     protected void resetPartTypeClass(BindingMessageInfo bmi) {
         if (bmi != null) {
-            for (MessagePartInfo part : bmi.getMessageParts()) {
-                part.setTypeClass(null);
-            }     
+            int size = bmi.getMessageParts().size();
+            for (int x = 0; x < size; x++) {
+                //last part can be streamed, others need DOM parsing 
+                if (x < (size - 1)) {
+                    bmi.getMessageParts().get(x).setTypeClass(DOMSource.class);
+                } else {
+                    bmi.getMessageParts().get(x).setTypeClass(Source.class);
+                }
+            }
         }
     }
     protected void resetPartTypeClass(MessageInfo msgInfo) {
         if (msgInfo != null) {
-            for (MessagePartInfo part : msgInfo.getMessageParts()) {
-                part.setTypeClass(null);
-            }     
+            int size = msgInfo.getMessageParts().size();
+            for (int x = 0; x < size; x++) {
+                //last part can be streamed, others need DOM parsing 
+                if (x < (size - 1)) {
+                    
msgInfo.getMessageParts().get(x).setTypeClass(DOMSource.class);
+                } else {
+                    
msgInfo.getMessageParts().get(x).setTypeClass(Source.class);
+                }
+            }
         }
     }
     private void removeFaultInInterceptorFromClient(Client client) {

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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -20,6 +20,9 @@ import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+
 import org.w3c.dom.Element;
 
 import org.apache.camel.Exchange;
@@ -42,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<Element> outElements = new ArrayList<Element>();
-                        outElements.add(details);
+                        List<Source> outElements = new ArrayList<Source>();
+                        outElements.add(new DOMSource(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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -18,6 +18,10 @@ package org.apache.camel.component.cxf;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.apache.camel.Exchange;
@@ -58,18 +62,19 @@ public class CxfConsumerPayloadTest exte
                     @SuppressWarnings("unchecked")
                     public void process(final Exchange exchange) throws 
Exception {
                         CxfPayload<SoapHeader> requestPayload = 
exchange.getIn().getBody(CxfPayload.class);
-                        List<Element> inElements = requestPayload.getBody();
-                        List<Element> outElements = new ArrayList<Element>();
+                        List<Source> inElements = requestPayload.getBody();
+                        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);
                         XmlConverter converter = new XmlConverter();
                         String documentString = ECHO_RESPONSE;
                         
+                        Element in = new 
XmlConverter().toDOMElement(inElements.get(0));
                         // Just check the element namespace
-                        if 
(!inElements.get(0).getNamespaceURI().equals(ELEMENT_NAMESPACE)) {
+                        if (!in.getNamespaceURI().equals(ELEMENT_NAMESPACE)) {
                             throw new IllegalArgumentException("Wrong element 
namespace");
                         }
-                        if 
(inElements.get(0).getLocalName().equals("echoBoolean")) {
+                        if (in.getLocalName().equals("echoBoolean")) {
                             documentString = ECHO_BOOLEAN_RESPONSE;
                             checkRequest("ECHO_BOOLEAN_REQUEST", request);
                         } else {
@@ -77,7 +82,7 @@ public class CxfConsumerPayloadTest exte
                             checkRequest("ECHO_REQUEST", request);
                         }
                         Document outDocument = 
converter.toDOMDocument(documentString);
-                        outElements.add(outDocument.getDocumentElement());
+                        outElements.add(new 
DOMSource(outDocument.getDocumentElement()));
                         // set the payload header with null
                         CxfPayload<SoapHeader> responsePayload = new 
CxfPayload<SoapHeader>(null, outElements);
                         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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -20,6 +20,9 @@ package org.apache.camel.component.cxf;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+
 import org.w3c.dom.Element;
 
 import org.apache.camel.CamelContext;
@@ -27,6 +30,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.cxf.common.message.CxfConstants;
+import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
@@ -92,7 +96,7 @@ public class CxfMixedModeRouterTest exte
 
                         if (message != null) {
                             // convert CxfPayload to list of objects any way 
you like
-                            Element element = message.getBody().get(0);
+                            Element element = new 
XmlConverter().toDOMElement(message.getBody().get(0));
                             
params.add(element.getFirstChild().getTextContent());
                         }
                             
@@ -119,8 +123,8 @@ public class CxfMixedModeRouterTest exte
                                 + "<return 
xmlns=\"http://cxf.component.camel.apache.org/\";>" 
                                 + list.get(0) 
                                 + "</return></ns1:echoResponse>";
-                            List<Element> body = new ArrayList<Element>();
-                            body.add(XMLUtils.parse(s).getDocumentElement());
+                            List<Source> body = new ArrayList<Source>();
+                            body.add(new 
DOMSource(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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -17,10 +17,14 @@
 package org.apache.camel.component.cxf;
 
 import java.util.List;
+
+import javax.xml.transform.Source;
+
 import org.w3c.dom.Element;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.converter.jaxp.XmlConverter;
 
 
 /**
@@ -41,10 +45,11 @@ public class CxfPayLoadMessageRouterAddr
                         
exchange.getIn().setHeader(Exchange.DESTINATION_OVERRIDE_URL, 
getServiceAddress());
                         
                         CxfPayload<?> payload = 
exchange.getIn().getBody(CxfPayload.class);
-                        List<Element> elements = payload.getBody();
+                        List<Source> elements = payload.getBody();
                         assertNotNull("We should get the elements here" , 
elements);
                         assertEquals("Get the wrong elements size" , 
elements.size(), 1);
-                        assertEquals("Get the wrong namespace URI" , 
elements.get(0).getNamespaceURI(), "http://cxf.component.camel.apache.org/";);
+                        Element el = new 
XmlConverter().toDOMElement(elements.get(0));
+                        assertEquals("Get the wrong namespace URI" , 
el.getNamespaceURI(), "http://cxf.component.camel.apache.org/";);
                     }
                     
                 })

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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -18,11 +18,14 @@ package org.apache.camel.component.cxf;
 
 import java.util.List;
 
+import javax.xml.transform.Source;
+
 import org.w3c.dom.Element;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.converter.jaxp.XmlConverter;
 
 
 /**
@@ -40,10 +43,11 @@ public class CxfPayLoadMessageRouterTest
                 from(routerEndpointURI).process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         CxfPayload<?> payload = 
exchange.getIn().getBody(CxfPayload.class);
-                        List<Element> elements = payload.getBody();
+                        List<Source> elements = payload.getBody();
                         assertNotNull("We should get the elements here" , 
elements);
                         assertEquals("Get the wrong elements size" , 
elements.size(), 1);
-                        assertEquals("Get the wrong namespace URI" , 
elements.get(0).getNamespaceURI(), "http://cxf.component.camel.apache.org/";);
+                        Element el = new 
XmlConverter().toDOMElement(elements.get(0));
+                        assertEquals("Get the wrong namespace URI" , 
el.getNamespaceURI(), "http://cxf.component.camel.apache.org/";);
                     }
                     
                 })

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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -18,12 +18,15 @@ package org.apache.camel.component.cxf;
 
 import java.util.List;
 
+import javax.xml.transform.Source;
+
 import org.w3c.dom.Element;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.spring.SpringCamelContext;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.cxf.endpoint.Server;
@@ -108,10 +111,12 @@ 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<Element> elements = payload.getBody();
+                        List<Source> elements = payload.getBody();
                         assertNotNull("We should get the elements here" , 
elements);
                         assertEquals("Get the wrong elements size" , 
elements.size(), 1);
-                        assertEquals("Get the wrong namespace URI" , 
elements.get(0).getNamespaceURI(), "http://cxf.component.camel.apache.org/";);
+                        
+                        Element el = new 
XmlConverter().toDOMElement(elements.get(0));
+                        assertEquals("Get the wrong namespace URI" , 
el.getNamespaceURI(), "http://cxf.component.camel.apache.org/";);
                     }
                     
                 })

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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -20,6 +20,8 @@ import java.net.URL;
 import java.util.List;
 
 import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.Endpoint;
 
@@ -28,6 +30,7 @@ import org.w3c.dom.Element;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.pizza.Pizza;
 import org.apache.camel.pizza.PizzaService;
 import org.apache.camel.pizza.types.CallerIDHeaderType;
@@ -70,11 +73,14 @@ public class CxfPayLoadSoapHeaderTest ex
                     @SuppressWarnings("unchecked")
                     public void process(Exchange exchange) throws Exception {
                         CxfPayload<SoapHeader> payload = 
exchange.getIn().getBody(CxfPayload.class);
-                        List<Element> elements = payload.getBody();
+                        List<Source> elements = payload.getBody();
                         assertNotNull("We should get the elements here", 
elements);
                         assertEquals("Get the wrong elements size", 1, 
elements.size());
+                        
+                        Element el = new 
XmlConverter().toDOMElement(elements.get(0));
+                        elements.set(0, new DOMSource(el));
                         assertEquals("Get the wrong namespace URI", 
"http://camel.apache.org/pizza/types";, 
-                                elements.get(0).getNamespaceURI());
+                                el.getNamespaceURI());
                             
                         List<SoapHeader> headers = payload.getHeaders();
                         assertNotNull("We should get the headers here", 
headers);

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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -24,6 +24,8 @@ import java.util.List;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -56,10 +58,10 @@ public class CxfPayloadConverterTest ext
         DocumentBuilder documentBuilder = 
documentBuilderFactory.newDocumentBuilder();
         document = documentBuilder.parse(file);
         document.getDocumentElement().normalize();
-        List<Element> body = new ArrayList<Element>();
-        body.add(document.getDocumentElement());
+        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<Element>());
+        emptyPayload = new CxfPayload<String[]>(new ArrayList<String[]>(), new 
ArrayList<Source>());
         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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -24,6 +24,8 @@ import java.util.Map;
 
 import javax.activation.DataHandler;
 import javax.mail.util.ByteArrayDataSource;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
 import javax.xml.xpath.XPathConstants;
 
 import org.w3c.dom.Element;
@@ -36,6 +38,7 @@ import org.apache.camel.ExchangePattern;
 import org.apache.camel.Processor;
 import org.apache.camel.component.cxf.CXFTestSupport;
 import org.apache.camel.component.cxf.CxfPayload;
+import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.cxf.binding.soap.SoapHeader;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.IOUtils;
@@ -67,8 +70,8 @@ public class CxfMtomConsumerPayloadModeT
             public void process(Exchange exchange) throws Exception {
                 exchange.setPattern(ExchangePattern.InOut);
                 assertEquals("Get a wrong Content-Type header", 
"application/xop+xml", exchange.getIn().getHeader("Content-Type"));
-                List<Element> elements = new ArrayList<Element>();
-                elements.add(DOMUtils.readXml(new 
StringReader(getRequestMessage())).getDocumentElement());
+                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);
                 exchange.getIn().setBody(body);
@@ -96,12 +99,13 @@ public class CxfMtomConsumerPayloadModeT
             ns.put("xop", MtomTestHelper.XOP_NS);
 
             XPathUtils xu = new XPathUtils(ns);
-            Element ele = 
(Element)xu.getValue("//ns:Detail/ns:photo/xop:Include", in.getBody().get(0),
+            Element body = new 
XmlConverter().toDOMElement(in.getBody().get(0));
+            Element ele = 
(Element)xu.getValue("//ns:Detail/ns:photo/xop:Include", body,
                                                XPathConstants.NODE);
             String photoId = ele.getAttribute("href").substring(4); // skip 
"cid:"
             Assert.assertEquals(MtomTestHelper.REQ_PHOTO_CID, photoId);
 
-            ele = (Element)xu.getValue("//ns:Detail/ns:image/xop:Include", 
in.getBody().get(0),
+            ele = (Element)xu.getValue("//ns:Detail/ns:image/xop:Include", 
body,
                                                XPathConstants.NODE);
             String imageId = ele.getAttribute("href").substring(4); // skip 
"cid:"
             Assert.assertEquals(MtomTestHelper.REQ_IMAGE_CID, imageId);
@@ -115,11 +119,11 @@ public class CxfMtomConsumerPayloadModeT
             MtomTestHelper.assertEquals(MtomTestHelper.requestJpeg, 
IOUtils.readBytesFromStream(dr.getInputStream()));
 
             // create response
-            List<Element> elements = new ArrayList<Element>();
-            elements.add(DOMUtils.readXml(new 
StringReader(MtomTestHelper.RESP_MESSAGE)).getDocumentElement());
-            CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new 
ArrayList<SoapHeader>(),
+            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);
-            exchange.getOut().setBody(body);
+            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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -22,6 +22,8 @@ import java.util.List;
 
 import javax.activation.DataHandler;
 import javax.mail.util.ByteArrayDataSource;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
 
 import org.w3c.dom.Element;
 
@@ -70,8 +72,8 @@ public class CxfMtomDisabledConsumerPayl
             MtomTestHelper.assertEquals(MtomTestHelper.requestJpeg, 
IOUtils.readBytesFromStream(dr.getInputStream()));
 
             // create response
-            List<Element> elements = new ArrayList<Element>();
-            elements.add(DOMUtils.readXml(new 
StringReader(MtomTestHelper.MTOM_DISABLED_RESP_MESSAGE)).getDocumentElement());
+            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);
             exchange.getOut().setBody(body);

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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -30,6 +30,8 @@ import javax.activation.DataSource;
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.mail.util.ByteArrayDataSource;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
 import javax.xml.ws.Holder;
 import javax.xml.ws.WebServiceContext;
 import javax.xml.ws.handler.MessageContext;
@@ -82,8 +84,8 @@ public class CxfMtomDisabledProducerPayl
 
             public void process(Exchange exchange) throws Exception {
                 exchange.setPattern(ExchangePattern.InOut);
-                List<Element> elements = new ArrayList<Element>();
-                elements.add(DOMUtils.readXml(new 
StringReader(MtomTestHelper.MTOM_DISABLED_REQ_MESSAGE)).getDocumentElement());
+                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);
                 exchange.getIn().setBody(body);

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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -26,6 +26,8 @@ import java.util.Map;
 import javax.activation.DataHandler;
 import javax.imageio.ImageIO;
 import javax.mail.util.ByteArrayDataSource;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
 import javax.xml.ws.Endpoint;
 import javax.xml.ws.soap.SOAPBinding;
 import javax.xml.xpath.XPathConstants;
@@ -38,6 +40,7 @@ import org.apache.camel.ExchangePattern;
 import org.apache.camel.Processor;
 import org.apache.camel.component.cxf.CXFTestSupport;
 import org.apache.camel.component.cxf.CxfPayload;
+import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.cxf.binding.soap.SoapHeader;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.IOUtils;
@@ -94,8 +97,8 @@ public class CxfMtomProducerPayloadModeT
 
             public void process(Exchange exchange) throws Exception {
                 exchange.setPattern(ExchangePattern.InOut);
-                List<Element> elements = new ArrayList<Element>();
-                elements.add(DOMUtils.readXml(new 
StringReader(MtomTestHelper.REQ_MESSAGE)).getDocumentElement());
+                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);
                 exchange.getIn().setBody(body);
@@ -119,11 +122,12 @@ public class CxfMtomProducerPayloadModeT
         ns.put("xop", MtomTestHelper.XOP_NS);
         
         XPathUtils xu = new XPathUtils(ns);
-        Element ele = 
(Element)xu.getValue("//ns:DetailResponse/ns:photo/xop:Include", 
out.getBody().get(0),
+        Element oute = new XmlConverter().toDOMElement(out.getBody().get(0));
+        Element ele = 
(Element)xu.getValue("//ns:DetailResponse/ns:photo/xop:Include", oute,
                                            XPathConstants.NODE);
         String photoId = ele.getAttribute("href").substring(4); // skip "cid:"
 
-        ele = (Element)xu.getValue("//ns:DetailResponse/ns:image/xop:Include", 
out.getBody().get(0),
+        ele = (Element)xu.getValue("//ns:DetailResponse/ns:image/xop:Include", 
oute,
                                            XPathConstants.NODE);
         String imageId = ele.getAttribute("href").substring(4); // skip "cid:"
 

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=1184812&r1=1184811&r2=1184812&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
 Sun Oct 16 12:31:30 2011
@@ -30,6 +30,8 @@ import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.Endpoint;
 import javax.xml.ws.Holder;
@@ -415,8 +417,8 @@ public class CxfMessageHeadersRelayTest 
             +   "</message></ns2:SOAPHeaderInfo>";
         String requestBody = "<ns2:inoutHeader 
xmlns:ns2=\"http://apache.org/camel/component/cxf/soap/headers\";>" 
             + "<requestType>CXF user</requestType></ns2:inoutHeader>";
-        List<Element> elements = new ArrayList<Element>();
-        elements.add(DOMUtils.readXml(new 
StringReader(requestBody)).getDocumentElement());
+        List<Source> elements = new ArrayList<Source>();
+        elements.add(new DOMSource(DOMUtils.readXml(new 
StringReader(requestBody)).getDocumentElement()));
         final List<SoapHeader> headers = new ArrayList<SoapHeader>();
         headers.add(new SoapHeader(qname,
                                    DOMUtils.readXml(new 
StringReader(requestHeader)).getDocumentElement()));
@@ -436,8 +438,7 @@ public class CxfMessageHeadersRelayTest 
 
         assertEquals(0, out.getHeaders().size());
         
-        String response = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" 
-            + "<ns2:inoutHeaderResponse xmlns:ns2=\"http://apache.org/camel/"; 
+        String response = "<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)));


Reply via email to