Return-Path: X-Original-To: apmail-ant-notifications-archive@minotaur.apache.org Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 396BA10FA5 for ; Sun, 1 Sep 2013 08:38:40 +0000 (UTC) Received: (qmail 65158 invoked by uid 500); 1 Sep 2013 08:38:39 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 65115 invoked by uid 500); 1 Sep 2013 08:38:38 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 65106 invoked by uid 99); 1 Sep 2013 08:38:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Sep 2013 08:38:32 +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; Sun, 01 Sep 2013 08:38:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 86CCD238889B for ; Sun, 1 Sep 2013 08:38:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1519248 - in /ant/easyant/core/trunk/src/main/java/org/apache/easyant/core: EasyAntEngine.java EasyAntMain.java Date: Sun, 01 Sep 2013 08:38:11 -0000 To: notifications@ant.apache.org From: jlboudart@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130901083811.86CCD238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jlboudart Date: Sun Sep 1 08:38:11 2013 New Revision: 1519248 URL: http://svn.apache.org/r1519248 Log: A bit of refactoring Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java?rev=1519248&r1=1519247&r2=1519248&view=diff ============================================================================== --- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java (original) +++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java Sun Sep 1 08:38:11 2013 @@ -582,7 +582,7 @@ public class EasyAntEngine { } - public void doBuild(final Project project) throws Error { + public void doBuild(final Project project) { project.fireBuildStarted(); Throwable error = null; @@ -610,10 +610,8 @@ public class EasyAntEngine { System.setErr(new PrintStream(new DemuxOutputStream(project, true))); // make sure that we have a target to execute - if (configuration.getTargets().size() == 0) { - if (project.getDefaultTarget() != null) { - configuration.getTargets().add(project.getDefaultTarget()); - } + if (configuration.getTargets().size() == 0 && project.getDefaultTarget() != null) { + configuration.getTargets().add(project.getDefaultTarget()); } project.executeTargets(new Vector(configuration.getTargets())); } finally { @@ -731,7 +729,7 @@ public class EasyAntEngine { msg.append(props.getProperty("DATE")); easyantVersion = msg.toString(); } catch (IOException ioe) { - throw new BuildException("Could not load the version information:" + ioe.getMessage()); + throw new BuildException("Could not load the version information", ioe); } finally { if (in != null) { try { Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java?rev=1519248&r1=1519247&r2=1519248&view=diff ============================================================================== --- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java (original) +++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java Sun Sep 1 08:38:11 2013 @@ -750,7 +750,7 @@ public class EasyAntMain implements AntM msg.append(props.getProperty("DATE")); antVersion = msg.toString(); } catch (IOException ioe) { - throw new BuildException("Could not load the version information:" + ioe.getMessage()); + throw new BuildException("Could not load the version information", ioe); } finally { if (in != null) { try {