cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r780914 - 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
Date Tue, 02 Jun 2009 02:49:25 GMT
Author: dkulp
Date: Tue Jun  2 02:49:25 2009
New Revision: 780914

URL: http://svn.apache.org/viewvc?rev=780914&view=rev
Log:
Merged revisions 777572 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r777572 | dkulp | 2009-05-22 11:25:20 -0400 (Fri, 22 May 2009) | 1 line
  
  Make -autoNameResolution work for method parameters as well.
........

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/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  2 02:49:25 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,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,780033,780184,780213,780421,780664
+/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,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,780033,780184,780213,780421,780664

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=780914&r1=780913&r2=780914&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
Tue Jun  2 02:49:25 2009
@@ -111,9 +111,17 @@
         if (parameter == null) {
             return null;
         }
+        String name = parameter.getName();
+        int count = 0;
+        while (method.getParameter(parameter.getName()) != null
+            && context.optionSet(ToolConstants.CFG_AUTORESOLVE)) {
+            parameter.setName(name + (++count));
+        }
+        
         parameter.setMethod(method);
         parameter.annotate(new WebParamAnnotator());
         method.addParameter(parameter);
+
         return parameter;
     }
 
@@ -638,6 +646,7 @@
                 style = JavaType.Style.OUT;
             } else if (outputPartsMap.get(inputMessage.getMessagePartQName(partName)) !=
null
                 && isSamePart(part, outputPartsMap.get(inputMessage.getMessagePartQName(partName))))
{
+                
                 style = JavaType.Style.INOUT;
             }
             if (part != null) {



Mime
View raw message