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/02/18 21:35:20 UTC
svn commit: r745639 - in /cxf/branches/2.1.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/...
Author: dkulp
Date: Wed Feb 18 20:35:18 2009
New Revision: 745639
URL: http://svn.apache.org/viewvc?rev=745639&view=rev
Log:
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.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapVersionRegistrar.java
- copied unchanged from r745638, cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapVersionRegistrar.java
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/Messages.properties
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 18 20:35:18 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592,745638
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml?rev=745639&r1=745638&r2=745639&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml (original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml Wed Feb 18 20:35:18 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.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java?rev=745639&r1=745638&r2=745639&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java (original)
+++ cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java Wed Feb 18 20:35:18 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 String javaDoc;
@@ -54,6 +56,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());
}
@@ -138,15 +152,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.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/Messages.properties?rev=745639&r1=745638&r2=745639&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/Messages.properties (original)
+++ cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/Messages.properties Wed Feb 18 20:35:18 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.1.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.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=745639&r1=745638&r2=745639&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Wed Feb 18 20:35:18 2009
@@ -706,10 +706,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