From 6f398b3e9248f8622bc53d56868a6df1f3d09d4a Mon Sep 17 00:00:00 2001
From: Costin Manolache <costin@apache.org>
Date: Thu, 10 Apr 2003 19:14:03 +0000
Subject: [PATCH] =?UTF-8?q?Patch=20from=20Lo=EF=BF=BD=EF=BF=BDc=20P?=
 =?UTF-8?q?=EF=BF=BD=EF=BF=BDron=20<loic.peron@bigfoot.com>=20to=20compile?=
 =?UTF-8?q?=20against=20ant153?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274432 13f79535-47bb-0310-9956-ffa450edef68
---
 proposal/embed/build.xml                                     | 4 ++--
 .../src/java/org/apache/tools/ant/RuntimeConfigurable2.java  | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/proposal/embed/build.xml b/proposal/embed/build.xml
index ced2ea383..70e8651ce 100644
--- a/proposal/embed/build.xml
+++ b/proposal/embed/build.xml
@@ -26,12 +26,12 @@
     
   <target name="build" depends="main" />
 
-  <target name="main" depends="init" >
-   <echo>Embed is no longer supported with ant1.6. It is only used with ant1.5 ! The dynamic properties work with both, use embed-optional target</echo>
+  <target name="main" depends="init,main-ant15" >
   </target>
 
   <target name="main-ant15" depends="init" 
           description="Build hacks into ant1.5 to support some 1.6 features" >
+   <echo>Embed is no longer supported with ant1.6. It is only used with ant1.5 ! The dynamic properties work with both, use embed-optional target</echo>
     <javac srcdir="src/java"  
            debug="${debug}"
            destdir="${embed.build}/classes" >
diff --git a/proposal/embed/src/java/org/apache/tools/ant/RuntimeConfigurable2.java b/proposal/embed/src/java/org/apache/tools/ant/RuntimeConfigurable2.java
index b54b7d6a9..89ba84006 100644
--- a/proposal/embed/src/java/org/apache/tools/ant/RuntimeConfigurable2.java
+++ b/proposal/embed/src/java/org/apache/tools/ant/RuntimeConfigurable2.java
@@ -288,14 +288,15 @@ public class RuntimeConfigurable2 extends RuntimeConfigurable {
 
         if (attributes != null) {
             IntrospectionHelper ih =
-                    IntrospectionHelper.getHelper(p, target.getClass());
+                    IntrospectionHelper.getHelper(target.getClass());
+            p.addBuildListener( ih );
 
             for (int i = 0; i < attributes.getLength(); i++) {
                 String name= attributes.getQName(i);
                 String value= attributes.getValue(i);
 
                 // reflect these into the target
-                value = ph.replaceProperties(null, value, null);
+                value = ph.replaceProperties(null, value, p.getProperties());
                 try {
                     ih.setAttribute(p, target,
                             name.toLowerCase(Locale.US), value);