You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/11/15 04:58:24 UTC
svn commit: r836319 - in /cxf/branches/2.1.x-fixes: ./
tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
Author: dkulp
Date: Sun Nov 15 03:58:23 2009
New Revision: 836319
URL: http://svn.apache.org/viewvc?rev=836319&view=rev
Log:
Merged revisions 836097 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................
r836097 | dkulp | 2009-11-13 21:26:08 -0500 (Fri, 13 Nov 2009) | 9 lines
Merged revisions 836092 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r836092 | dkulp | 2009-11-13 21:22:44 -0500 (Fri, 13 Nov 2009) | 1 line
Another tck regression
........
................
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java?rev=836319&r1=836318&r2=836319&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java (original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java Sun Nov 15 03:58:23 2009
@@ -295,7 +295,25 @@
}
continue;
} else if (isSamePart(inpart, outpart)) {
- addParameter(method, getParameterFromPart(method, outpart, JavaType.Style.INOUT));
+ boolean found = false;
+ for (JavaParameter p : method.getParameters()) {
+ if (p.getQName().equals(ProcessorUtil.getElementName(outpart))) {
+ p.setHolder(true);
+ p.setHolderName(javax.xml.ws.Holder.class.getName());
+ String holderClass = p.getClassName();
+ if (JAXBUtils.holderClass(holderClass) != null) {
+ holderClass = JAXBUtils.holderClass(holderClass).getName();
+ }
+ p.setClassName(holderClass);
+ p.getAnnotations().clear();
+ p.setStyle(JavaType.Style.INOUT);
+ p.annotate(new WebParamAnnotator());
+ found = true;
+ }
+ }
+ if (!found) {
+ addParameter(method, getParameterFromPart(method, outpart, JavaType.Style.INOUT));
+ }
continue;
} else if (!isSamePart(inpart, outpart)) {
if (oob) {