Author: dkulp
Date: Wed Apr 1 18:53:12 2009
New Revision: 761010
URL: http://svn.apache.org/viewvc?rev=761010&view=rev
Log:
Merged revisions 760582 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r760582 | dkulp | 2009-03-31 16:06:31 -0400 (Tue, 31 Mar 2009) | 2 lines
[CXF-2138] Add parameterOrder attribute to doc/lit/bare things
........
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/soap_header.wsdl
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 1 18:53:12 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
+/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
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=761010&r1=761009&r2=761010&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
Wed Apr 1 18:53:12 2009
@@ -1417,7 +1417,7 @@
}
private void setParameterOrder(Method method, Class[] paramClasses,
OperationInfo op) {
- if (isRPC(method)) {
+ if (isRPC(method) || !isWrapped(method)) {
List<String> paramOrdering = new LinkedList<String>();
boolean hasOut = false;
for (int j = 0; j < paramClasses.length; j++) {
Modified:
cxf/branches/2.1.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.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/soap_header.wsdl?rev=761010&r1=761009&r2=761010&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl
(original)
+++
cxf/branches/2.1.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl
Wed Apr 1 18:53:12 2009
@@ -104,7 +104,7 @@
</wsdl:part>
</wsdl:message>
<wsdl:portType name="headerTester">
- <wsdl:operation name="outHeader">
+ <wsdl:operation name="outHeader" parameterOrder="me the_response
header_info">
<wsdl:input name="outHeader" message="tns:outHeader">
</wsdl:input>
<wsdl:output name="outHeaderResponse" message="tns:outHeaderResponse">
@@ -116,7 +116,7 @@
<wsdl:output name="inHeaderResponse" message="tns:inHeaderResponse">
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="inoutHeader">
+ <wsdl:operation name="inoutHeader" parameterOrder="me header_info">
<wsdl:input name="inoutHeader" message="tns:inoutHeader">
</wsdl:input>
<wsdl:output name="inoutHeaderResponse"
message="tns:inoutHeaderResponse">
