From 9ee51f37b5868699c043009e4ef62826fbd7a171 Mon Sep 17 00:00:00 2001 From: Costin Manolache Date: Sat, 27 Jul 2002 02:20:16 +0000 Subject: [PATCH] Add the new taskdef ( it'll replace the original one ). ( we need the new one so that it works with ant1.5 ) git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273176 13f79535-47bb-0310-9956-ffa450edef68 --- .../embed/src/java/org/apache/tools/ant/PropertyHelper.java | 2 +- .../java/org/apache/tools/ant/helper/ProjectHelperImpl2.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java b/proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java index 47d0e7f46..244a661b5 100644 --- a/proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java +++ b/proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java @@ -145,7 +145,7 @@ public class PropertyHelper { + "} has not been set", Project.MSG_VERBOSE); fragment="${" + propertyName + "}"; } else { - fragment = (String) repl; + fragment = repl.toString(); } } sb.append(fragment); diff --git a/proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java b/proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java index 612fb7bcd..e743006f7 100644 --- a/proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java +++ b/proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java @@ -105,8 +105,8 @@ public class ProjectHelperImpl2 extends ProjectHelper { project.addTaskDefinition( "systemPath" , c ); c=Class.forName("org.apache.tools.ant.taskdefs.Import"); project.addTaskDefinition( "import" , c ); - c=Class.forName("org.apache.tools.ant.taskdefs.optional.JXPath"); - project.addTaskDefinition( "jxpath" , c ); + c=Class.forName("org.apache.tools.ant.taskdefs.Taskdef2"); + project.addTaskDefinition( "taskdef" , c ); } catch (Exception ex ) { ex.printStackTrace(); }