cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r745662 - in /cxf/branches/2.0.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/ rt/bindings/soap/src/main/resources/META-INF/cxf/ tools/common/src/main/java/org/apache/cxf/tools/common/model/ tools/wsdlto/test/...
Date Wed, 18 Feb 2009 21:29:07 GMT
Author: dkulp
Date: Wed Feb 18 21:29:04 2009
New Revision: 745662

URL: http://svn.apache.org/viewvc?rev=745662&view=rev
Log:
Merged revisions 745639 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r745639 | dkulp | 2009-02-18 15:35:18 -0500 (Wed, 18 Feb 2009) | 10 lines
  
  Merged revisions 745638 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r745638 | dkulp | 2009-02-18 15:34:10 -0500 (Wed, 18 Feb 2009) | 3 lines
    
    [CXF-918] Make sure exception is thrown if parameter names match, but types are different
    Another attempt to support spring 3.0 along with spring 2.0 and 2.5
  ........
................

Added:
    cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapVersionRegistrar.java
      - copied unchanged from r745639, cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapVersionRegistrar.java
Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
    cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
    cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/Messages.properties
    cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 18 21:29:04 2009
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638
 /incubator/cxf/trunk:434594-651668

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml?rev=745662&r1=745661&r2=745662&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
(original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
Wed Feb 18 21:29:04 2009
@@ -53,11 +53,10 @@
         
 	<bean id="org.apache.cxf.binding.soap.customEditorConfigurer"
 		class="org.springframework.beans.factory.config.CustomEditorConfigurer">
-		<property name="customEditors">
-			<map>
-				<entry key="org.apache.cxf.binding.soap.SoapVersion" 
-					value="org.apache.cxf.binding.soap.SoapVersionEditor"/>
-			</map>
+		<property name="propertyEditorRegistrars">
+			<list>
+				<bean class="org.apache.cxf.binding.soap.spring.SoapVersionRegistrar"/>
+			</list>
 		</property>
 	</bean>
 </beans>

Modified: cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java?rev=745662&r1=745661&r2=745662&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
(original)
+++ cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
Wed Feb 18 21:29:04 2009
@@ -35,6 +35,8 @@
 
 public class JavaMethod implements JavaAnnotatable {
     private static final Logger LOG = LogUtils.getL7dLogger(JavaMethod.class);
+    private static final Map<String, String> PRIMITIVE_MAP;
+    
     private String name;
     private String operationName;
     private JavaReturn javaReturn;
@@ -53,6 +55,18 @@
 
     private boolean async;
     
+    static { 
+        PRIMITIVE_MAP = new HashMap<String, String>();
+        PRIMITIVE_MAP.put("java.lang.Character", "char");
+        PRIMITIVE_MAP.put("java.lang.Boolean", "boolean");
+        PRIMITIVE_MAP.put("java.lang.Integer", "int");
+        PRIMITIVE_MAP.put("java.lang.Long", "long");
+        PRIMITIVE_MAP.put("java.lang.Short", "short");
+        PRIMITIVE_MAP.put("java.lang.Byte", "byte");
+        PRIMITIVE_MAP.put("java.lang.Float", "float");
+        PRIMITIVE_MAP.put("java.lang.Double", "double");
+    }
+
     public JavaMethod() {
         this(new JavaInterface());
     }
@@ -137,15 +151,27 @@
         parameters.add(index, p2);
     }
 
+    private boolean isEquiv(String c1, String c2) {
+        //for the "in/out" params, we need to check if the 
+        //primitive in is being changed to an in/out
+        //which would no longer be primitive
+        String s = PRIMITIVE_MAP.get(c2);
+        if (s != null && c1.equals(s)) {
+            return true;
+        }
+        return c1.equals(c2);
+    }
     public void addParameter(JavaParameter param) {
         if (hasParameter(param.getName())) {
             JavaParameter paramInList = getParameter(param.getName());
-            if (paramInList.isIN() || paramInList.isINOUT()) {
+            if (isEquiv(paramInList.getClassName(), param.getClassName())
+                && paramInList.isIN() || paramInList.isINOUT()) {
                 //removeParameter(paramInList);
                 replaceParameter(paramInList, param);
                 return;
             } else {
-                Message message = new Message("PARAMETER_ALREADY_EXIST", LOG, param.getName());
+                Message message = new Message("PARAMETER_ALREADY_EXIST", LOG, param.getName(),

+                                              getName(), paramInList.getType(), param.getType());
                 throw new ToolException(message);
             }
         }

Modified: cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/Messages.properties?rev=745662&r1=745661&r2=745662&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/Messages.properties
(original)
+++ cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/Messages.properties
Wed Feb 18 21:29:04 2009
@@ -18,7 +18,7 @@
 #    under the License.
 #
 #
-PARAMETER_ALREADY_EXIST = Parameter: {0} already exists in the wsdl model
+PARAMETER_ALREADY_EXIST = Parameter: {0} already exists for method {1} but of type {2} instead
of {3}.  Use a JAXWS/JAXB binding customization to rename the parameter.
 CREATE_JAXBRICONTEXT_EXCEPTION = Failed to create jaxbRIContext
 FAIL_TO_CREATE_WSDL_DEFINITION = Failed to create wsdl definition in WSDLModel
 FAIL_TO_CREATE_JAVA_PARAMETER = Failed to create java parameter for part [{0}] in method
[{1}] - this wsdl is invalid, please use the wsdlvalidator tool to validate this wsdl

Modified: cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=745662&r1=745661&r2=745662&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
(original)
+++ cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Wed Feb 18 21:29:04 2009
@@ -702,10 +702,15 @@
     }
     @Test
     public void testNonWrapperStyleNameCollision() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL,
-                getLocation("/wsdl2java_wsdl/cxf918/bug2.wsdl"));
-        processor.setContext(env);
-        processor.execute();
+        try {
+            env.put(ToolConstants.CFG_WSDLURL,
+                    getLocation("/wsdl2java_wsdl/cxf918/bug2.wsdl"));
+            processor.setContext(env);
+            processor.execute();
+            fail("The cxf918/bug2.wsdl should not have generated code");
+        } catch (Exception e) {
+            assertTrue(e.getMessage(), e.getMessage().contains("theSameNameFieldDifferentDataType"));
+        } 
     }
 
     @Test



Mime
View raw message