costin 2003/04/10 12:14:03
Modified: proposal/embed build.xml proposal/embed/src/java/org/apache/tools/ant RuntimeConfigurable2.java Log: Patch from Loïc Péron <[EMAIL PROTECTED]> to compile against ant153 Revision Changes Path 1.9 +2 -2 ant/proposal/embed/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/ant/proposal/embed/build.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- build.xml 29 Dec 2002 06:06:27 -0000 1.8 +++ build.xml 10 Apr 2003 19:14:02 -0000 1.9 @@ -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" > 1.9 +3 -2 ant/proposal/embed/src/java/org/apache/tools/ant/RuntimeConfigurable2.java Index: RuntimeConfigurable2.java =================================================================== RCS file: /home/cvs/ant/proposal/embed/src/java/org/apache/tools/ant/RuntimeConfigurable2.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- RuntimeConfigurable2.java 7 Mar 2003 11:22:57 -0000 1.8 +++ RuntimeConfigurable2.java 10 Apr 2003 19:14:03 -0000 1.9 @@ -288,14 +288,15 @@ 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);