Author: hadrian
Date: Fri Apr 8 01:56:33 2011
New Revision: 1090085
URL: http://svn.apache.org/viewvc?rev=1090085&view=rev
Log:
CAMEL-3810. Backport to 2.7.x
Added:
camel/branches/camel-2.7.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/multipart/
- copied from r1087612,
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/multipart/
camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/MultiPartTest.wsdl
- copied unchanged from r1087612,
camel/trunk/components/camel-cxf/src/test/resources/MultiPartTest.wsdl
camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/multipart/
- copied from r1087612,
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/multipart/
camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/multipart/MultiPartTest.xml
- copied unchanged from r1087612,
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/multipart/MultiPartTest.xml
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-cxf/pom.xml
camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
camel/branches/camel-2.7.x/components/camel-http/ (props changed)
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 8 01:56:33 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1087276,1087856,1088583,1088916-1088917,1089275
+/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275
Modified: camel/branches/camel-2.7.x/components/camel-cxf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-cxf/pom.xml?rev=1090085&r1=1090084&r2=1090085&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-cxf/pom.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-cxf/pom.xml Fri Apr 8 01:56:33
2011
@@ -234,6 +234,9 @@
<wsdl>${basedir}/src/test/resources/mtom.wsdl</wsdl>
</wsdlOption>
<wsdlOption>
+
<wsdl>${basedir}/src/test/resources/MultiPartTest.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
<wsdl>${basedir}/src/test/resources/person.wsdl</wsdl>
</wsdlOption>
<wsdlOption>
Modified:
camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1090085&r1=1090084&r2=1090085&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
Fri Apr 8 01:56:33 2011
@@ -617,7 +617,7 @@ public class CxfEndpoint extends Default
MessageContentsList content = new MessageContentsList();
int i = 0;
- for (MessagePartInfo partInfo :
boi.getOperationInfo().getInput().getMessageParts()) {
+ for (MessagePartInfo partInfo :
boi.getInput().getMessageParts()) {
if (elements.size() > i &&
partInfo.getConcreteName().getLocalPart()
.equals(elements.get(i).getLocalName())) {
content.put(partInfo, elements.get(i++));
Modified:
camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java?rev=1090085&r1=1090084&r2=1090085&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
Fri Apr 8 01:56:33 2011
@@ -390,7 +390,7 @@ public class DefaultCxfBinding implement
int i = 0;
- for (MessagePartInfo partInfo :
boi.getOperationInfo().getOutput().getMessageParts()) {
+ for (MessagePartInfo partInfo : boi.getOutput().getMessageParts()) {
if (elements.size() > i) {
answer.put(partInfo, elements.get(i++));
Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 8 01:56:33 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1083696,1087276,1087856,1088583,1088916-1088917,1089275
+/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275
