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/07/10 17:49:28 UTC
svn commit: r792992 - in /cxf/branches/2.2.x-fixes: ./
maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOptionLoader.java
Author: dkulp
Date: Fri Jul 10 15:49:27 2009
New Revision: 792992
URL: http://svn.apache.org/viewvc?rev=792992&view=rev
Log:
Merged revisions 792684 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r792684 | dkulp | 2009-07-09 16:54:11 -0400 (Thu, 09 Jul 2009) | 1 line
[CXF-2191] Support WSDL as wsdl extension in codegen plugin
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOptionLoader.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 10 15:49:27 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792684
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOptionLoader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOptionLoader.java?rev=792992&r1=792991&r2=792992&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOptionLoader.java (original)
+++ cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOptionLoader.java Fri Jul 10 15:49:27 2009
@@ -113,11 +113,17 @@
}
String wsdlName = wsdl.getName();
- wsdlName = wsdlName.substring(0, wsdlName.indexOf(".wsdl"));
- File options = getOptions(dir, wsdlName + WSDL_OPTIONS);
- List<File> bindings = getBindingFiles(dir, wsdlName + WSDL_BINDINGS);
-
- jobs.add(generateWsdlOption(wsdl, bindings, options, defaultOptions));
+ int idx = wsdlName.toLowerCase().lastIndexOf(".wsdl");
+ if (idx == -1) {
+ idx = wsdlName.lastIndexOf('.');
+ }
+ if (idx != -1) {
+ wsdlName = wsdlName.substring(0, idx);
+ File options = getOptions(dir, wsdlName + WSDL_OPTIONS);
+ List<File> bindings = getBindingFiles(dir, wsdlName + WSDL_BINDINGS);
+
+ jobs.add(generateWsdlOption(wsdl, bindings, options, defaultOptions));
+ }
}
return jobs;
}