cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1240363 - in /cxf/branches/2.5.x-fixes: ./ maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java
Date Fri, 03 Feb 2012 21:57:19 GMT
Author: dkulp
Date: Fri Feb  3 21:57:19 2012
New Revision: 1240363

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

........
  r1240357 | dkulp | 2012-02-03 16:54:45 -0500 (Fri, 03 Feb 2012) | 1 line
  
  [CXF-4068] Make sure wsdlLocation is merged from defaultOptions
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb  3 21:57:19 2012
@@ -1 +1 @@
-/cxf/trunk:1240325
+/cxf/trunk:1240325,1240357

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

Modified: cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java?rev=1240363&r1=1240362&r2=1240363&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java
(original)
+++ cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java
Fri Feb  3 21:57:19 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")



Mime
View raw message