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 E1E3810B23 for ; Sun, 7 Jul 2013 15:47:57 +0000 (UTC) Received: (qmail 68389 invoked by uid 500); 7 Jul 2013 15:47:56 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 68352 invoked by uid 500); 7 Jul 2013 15:47:51 -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 68343 invoked by uid 99); 7 Jul 2013 15:47:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Jul 2013 15:47:49 +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, 07 Jul 2013 15:47:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2E7D123888A6 for ; Sun, 7 Jul 2013 15:47:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1500460 - /ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java Date: Sun, 07 Jul 2013 15:47:28 -0000 To: notifications@ant.apache.org From: jlboudart@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130707154728.2E7D123888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jlboudart Date: Sun Jul 7 15:47:27 2013 New Revision: 1500460 URL: http://svn.apache.org/r1500460 Log: src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java?rev=1500460&r1=1500459&r2=1500460&view=diff ============================================================================== --- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java (original) +++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java Sun Jul 7 15:47:27 2013 @@ -23,8 +23,8 @@ import java.io.IOException; import java.util.Enumeration; import java.util.Iterator; import java.util.Map; -import java.util.Properties; import java.util.Map.Entry; +import java.util.Properties; import org.apache.easyant.core.EasyAntConstants; import org.apache.easyant.core.EasyAntMagicNames; @@ -70,6 +70,8 @@ import org.apache.tools.ant.ExtensionPoi import org.apache.tools.ant.Location; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectHelper; +import org.apache.tools.ant.PropertyHelper; +import org.apache.tools.ant.PropertyHelper.PropertyEvaluator; import org.apache.tools.ant.Target; import org.apache.tools.ant.Task; import org.apache.tools.ant.UnknownElement; @@ -209,6 +211,16 @@ public class DefaultPluginServiceImpl im project.setNewProperty(EasyAntMagicNames.SKIP_CORE_REVISION_CHECKER, "true"); project.addReference(EasyAntMagicNames.EASYANT_IVY_INSTANCE, easyantIvySettings); project.addBuildListener(new TaskCollectorFromImplicitTargetListener()); + + //add a property helper to ignore basedir property on reports + PropertyHelper propertyHelper = PropertyHelper.getPropertyHelper(project); + propertyHelper.add(new PropertyEvaluator() { + + public Object evaluate(String propertyName, PropertyHelper helper) { + return propertyName.equals("basedir") ? "${basedir}" : null; + } + + }); if (properties != null) { for (Entry entry : properties.entrySet()) {