From commits-return-32791-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org Thu Jun 26 15:55:12 2014 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 E1C461186C for ; Thu, 26 Jun 2014 15:55:11 +0000 (UTC) Received: (qmail 19071 invoked by uid 500); 26 Jun 2014 15:55:11 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 18869 invoked by uid 500); 26 Jun 2014 15:55:11 -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 18844 invoked by uid 99); 26 Jun 2014 15:55:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jun 2014 15:55:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7961F8A0708; Thu, 26 Jun 2014 15:55:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Thu, 26 Jun 2014 15:55:12 -0000 Message-Id: <87bda97beaba44808113701c5f79e8a0@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: [CXF-5825] Fix the "verbose" logic in the tools [CXF-5825] Fix the "verbose" logic in the tools Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f24a5bec Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f24a5bec Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f24a5bec Branch: refs/heads/master Commit: f24a5bec9d7236f9b4b7f208b1f570cdf0381a61 Parents: 53270bd Author: Daniel Kulp Authored: Thu Jun 26 11:05:46 2014 -0400 Committer: Daniel Kulp Committed: Thu Jun 26 11:55:04 2014 -0400 ---------------------------------------------------------------------- core/src/main/java/org/apache/cxf/common/util/Compiler.java | 3 --- .../src/main/java/org/apache/cxf/tools/common/ToolContext.java | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f24a5bec/core/src/main/java/org/apache/cxf/common/util/Compiler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/Compiler.java b/core/src/main/java/org/apache/cxf/common/util/Compiler.java index 1567b70..e0247d8 100644 --- a/core/src/main/java/org/apache/cxf/common/util/Compiler.java +++ b/core/src/main/java/org/apache/cxf/common/util/Compiler.java @@ -85,9 +85,6 @@ public class Compiler { } protected void addArgs(List list) { - if (verbose) { - list.add("-verbose"); - } if (!StringUtils.isEmpty(encoding)) { list.add("-encoding"); list.add(encoding); http://git-wip-us.apache.org/repos/asf/cxf/blob/f24a5bec/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java index 0e6ca33..c3535dc 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java @@ -160,11 +160,11 @@ public class ToolContext { } public boolean isVerbose() { - Object verboseProperty = get(ToolConstants.CFG_VERBOSE); + String verboseProperty = get(ToolConstants.CFG_VERBOSE, String.class); if (verboseProperty == null) { return false; } else { - return ToolConstants.CFG_VERBOSE.equals(verboseProperty); + return ToolConstants.CFG_VERBOSE.equals(verboseProperty) || Boolean.parseBoolean(verboseProperty); } }