From 32ccb517d0a1cfba197ab62082ca39536728aa91 Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Mon, 3 Sep 2007 15:56:16 +0000
Subject: [PATCH] remove resolution for references that are not resolved during
 normal runtime execution

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@572374 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                      |  5 +++-
 src/main/org/apache/tools/ant/Project.java    | 26 +------------------
 .../types/conditions/isreference-test.xml     | 23 ++++++++++++++++
 3 files changed, 28 insertions(+), 26 deletions(-)
 create mode 100644 src/tests/antunit/types/conditions/isreference-test.xml

diff --git a/WHATSNEW b/WHATSNEW
index 558342c35..78f00ff13 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -24,7 +24,10 @@ Changes that could break older environments:
 * In the <touch> task when a <mapper> is used, the millis and datetime
   attributes now override the time of the source resource if provisioned. 
   Bugzilla report 43235.
-  
+
+* Remove fall-back mechanism for references that are not resolved
+  during normal runtime execution.
+
 Fixed bugs:
 -----------
 
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index 5395ffcd3..e92dbce6e 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -1885,28 +1885,6 @@ public class Project implements ResourceFactory {
         parentIdProject = parent;
     }
 
-    /**
-     * Attempt to resolve an Unknown Reference using the
-     * parsed id's - for BC.
-     */
-    private Object resolveIdReference(String key, Project callerProject) {
-        UnknownElement origUE = (UnknownElement) idReferences.get(key);
-        if (origUE == null) {
-            return parentIdProject == null
-                ? null
-                : parentIdProject.resolveIdReference(key, callerProject);
-        }
-        callerProject.log(
-            "Warning: Reference " + key + " has not been set at runtime,"
-            + " but was found during" + LINE_SEP
-            + "build file parsing, attempting to resolve."
-            + " Future versions of Ant may support" + LINE_SEP
-            + " referencing ids defined in non-executed targets.", MSG_WARN);
-        UnknownElement copyUE = origUE.copy(callerProject);
-        copyUE.maybeConfigure();
-        return copyUE.getRealThing();
-    }
-
     /**
      * Add an id reference.
      * Used for broken build files.
@@ -1963,9 +1941,7 @@ public class Project implements ResourceFactory {
         if (ret != null) {
             return ret;
         }
-        // Check for old id behaviour
-        ret = resolveIdReference(key, this);
-        if (ret == null && !key.equals(MagicNames.REFID_PROPERTY_HELPER)) {
+        if (!key.equals(MagicNames.REFID_PROPERTY_HELPER)) {
             try {
                 if (PropertyHelper.getPropertyHelper(this).containsProperties(key)) {
                     log("Unresolvable reference " + key
diff --git a/src/tests/antunit/types/conditions/isreference-test.xml b/src/tests/antunit/types/conditions/isreference-test.xml
new file mode 100644
index 000000000..ef5d24e76
--- /dev/null
+++ b/src/tests/antunit/types/conditions/isreference-test.xml
@@ -0,0 +1,23 @@
+<project name="isreference-test" default="antunit"
+         xmlns:au="antlib:org.apache.ant.antunit">
+
+  <import file="../../antunit-base.xml" />
+
+  <target name="out-of-band">
+    <path id="out-of-band" path="."/>
+  </target>
+
+  <target name="testOutOfBand">
+    <au:assertFalse>
+      <isreference refid="out-of-band"/>
+    </au:assertFalse>
+  </target>
+
+  <target name="testInBand">
+    <path id="in-band" path="."/>
+    <au:assertTrue>
+      <isreference refid="in-band"/>
+    </au:assertTrue>
+  </target>
+</project>
+