From 12383504acb3a04807fbb9b642ce8b272015c197 Mon Sep 17 00:00:00 2001 From: Antoine Levy-Lambert Date: Tue, 22 Jul 2003 11:58:55 +0000 Subject: [PATCH] References not passed by antcall PR: 21724 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274884 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 2 + src/etc/testcases/taskdefs/calltarget.xml | 45 ++++++++++ src/main/org/apache/tools/ant/Project.java | 5 +- .../org/apache/tools/ant/UnknownElement.java | 10 +++ .../tools/ant/taskdefs/CallTargetTest.java | 87 +++++++++++++++++++ 5 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 src/etc/testcases/taskdefs/calltarget.xml create mode 100644 src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java diff --git a/WHATSNEW b/WHATSNEW index 83303d9b4..1eb443e11 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -210,6 +210,8 @@ Fixed bugs: * Prevent sysproperties with no key or no value from being added in . Bugzilla Report 21684. +* Allow references to be properly inherited via antcall + Bugzilla Report 21724. Other changes: -------------- diff --git a/src/etc/testcases/taskdefs/calltarget.xml b/src/etc/testcases/taskdefs/calltarget.xml new file mode 100644 index 000000000..f4d790553 --- /dev/null +++ b/src/etc/testcases/taskdefs/calltarget.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@foo@@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java index 0db6e212c..a59831c77 100644 --- a/src/main/org/apache/tools/ant/Project.java +++ b/src/main/org/apache/tools/ant/Project.java @@ -2063,8 +2063,9 @@ public class Project { Object o = super.get(key); if (o instanceof UnknownElement) { // Make sure that - ((UnknownElement) o).maybeConfigure(); - o = ((UnknownElement) o).getTask(); + UnknownElement ue = (UnknownElement) o; + ue.maybeConfigure(); + o = ue.getRealThing(); } return o; } diff --git a/src/main/org/apache/tools/ant/UnknownElement.java b/src/main/org/apache/tools/ant/UnknownElement.java index 5582c09e7..77010aa01 100644 --- a/src/main/org/apache/tools/ant/UnknownElement.java +++ b/src/main/org/apache/tools/ant/UnknownElement.java @@ -457,6 +457,16 @@ public class UnknownElement extends Task { return null; } + /** + * Return the configured object + * + * @return the real thing whatever it is + * + * @since ant 1.6 + */ + public Object getRealThing() { + return realThing; + } /** * Try to create a nested element of parent for the * given tag. diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java new file mode 100644 index 000000000..8ca293172 --- /dev/null +++ b/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java @@ -0,0 +1,87 @@ +/* + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2003 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowlegement: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowlegement may appear in the software itself, + * if and wherever such third-party acknowlegements normally appear. + * + * 4. The names "Ant" and "Apache Software + * Foundation" must not be used to endorse or promote products derived + * from this software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + */ + +package org.apache.tools.ant.taskdefs; + +import org.apache.tools.ant.BuildFileTest; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.util.JavaEnvUtils; + +/** + * @author Nico Seessle + */ +public class CallTargetTest extends BuildFileTest { + + public CallTargetTest(String name) { + super(name); + } + + public void setUp() { + configureProject("src/etc/testcases/taskdefs/calltarget.xml"); + } + + // see bugrep 21724 (references not passing through with antcall) + public void testInheritRefFileSet() { + expectLogContaining("testinheritreffileset", "calltarget.xml"); + } + + // see bugrep 21724 (references not passing through with antcall) + public void testInheritFilterset() { + project.executeTarget("testinheritfilterset"); + } + + public void tearDown() { + project.executeTarget("cleanup"); + } +}