Author: dkulp
Date: Mon Apr 13 19:40:36 2009
New Revision: 764581
URL: http://svn.apache.org/viewvc?rev=764581&view=rev
Log:
[CXF-2097] Rename response part to "result" if there is a header part to match
what wsgen does
Modified:
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl
Modified:
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=764581&r1=764580&r2=764581&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Mon Apr 13 19:40:36 2009
@@ -1532,6 +1532,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/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl?rev=764581&r1=764580&r2=764581&view=diff
==============================================================================
---
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl
(original)
+++
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl
Mon Apr 13 19:40:36 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>
