Author: dkulp
Date: Mon Apr 13 19:53:13 2009
New Revision: 764587
URL: http://svn.apache.org/viewvc?rev=764587&view=rev
Log:
Merged revisions 764581 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r764581 | dkulp | 2009-04-13 15:40:36 -0400 (Mon, 13 Apr 2009) | 2 lines
[CXF-2097] Rename response part to "result" if there is a header part to
match what wsgen does
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
cxf/branches/2.1.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 19:53:13 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=764587&r1=764586&r2=764587&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Mon Apr 13 19:53:13 2009
@@ -1495,6 +1495,13 @@
break;
}
}
+ for (MessagePartInfo mpart : op.getOutput().getMessageParts()) {
+ if (Boolean.TRUE.equals(mpart.getProperty(HEADER))) {
+ partName = "result";
+ break;
+ }
+ }
+
if (partName == null) {
partName = "parameters";
}
Modified:
cxf/branches/2.1.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl?rev=764587&r1=764586&r2=764587&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl
(original)
+++
cxf/branches/2.1.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl
Mon Apr 13 19:53:13 2009
@@ -50,7 +50,7 @@
</wsdl:part>
</wsdl:message>
<wsdl:message name="echo3Response">
- <wsdl:part name="parameters" element="tns:echo3Response">
+ <wsdl:part name="result" element="tns:echo3Response">
</wsdl:part>
<wsdl:part name="header" element="tns:header">
</wsdl:part>
@@ -123,7 +123,7 @@
<wsdl:output name="echo3Response">
<soap:header message="tns:echo3Response" part="header" use="literal">
</soap:header>
- <soap:body parts="parameters" use="literal"/>
+ <soap:body parts="result" use="literal"/>
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
