Author: dkulp
Date: Fri Feb 3 21:54:45 2012
New Revision: 1240357
URL: http://svn.apache.org/viewvc?rev=1240357&view=rev
Log:
[CXF-4068] Make sure wsdlLocation is merged from defaultOptions
Modified:
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java
Modified:
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java?rev=1240357&r1=1240356&r2=1240357&view=diff
==============================================================================
---
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java
(original)
+++
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java
Fri Feb 3 21:54:45 2012
@@ -500,6 +500,9 @@ public class Option {
bareMethods = mergeList(bareMethods, defaultOptions.bareMethods,
String.class);
asyncMethods = mergeList(asyncMethods, defaultOptions.asyncMethods,
String.class);
mimeMethods = mergeList(mimeMethods, defaultOptions.mimeMethods,
String.class);
+ if (!isSetWsdlLocation() && defaultOptions.isSetWsdlLocation()) {
+ wsdlLocation = defaultOptions.getWsdlLocation();
+ }
}
@SuppressWarnings("unchecked")
