Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A30EC9672 for ; Fri, 3 Feb 2012 21:55:07 +0000 (UTC) Received: (qmail 21616 invoked by uid 500); 3 Feb 2012 21:55:07 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 21513 invoked by uid 500); 3 Feb 2012 21:55:06 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 21505 invoked by uid 99); 3 Feb 2012 21:55:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Feb 2012 21:55:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Feb 2012 21:55:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 920FB238897D for ; Fri, 3 Feb 2012 21:54:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1240357 - /cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java Date: Fri, 03 Feb 2012 21:54:45 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120203215445.920FB238897D@eris.apache.org> 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")