From f24c137b4044055a585eea9e74892d4d5a42d213 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 11 Dec 2007 17:43:00 +0000 Subject: [PATCH 1/1] Use ProjectImpl2 in order to deal with import of Ant files ASSIGNED - bug 45: imported ANT tasks are not found by SLC https://www.argeo.org/bugzilla/show_bug.cgi?id=45 git-svn-id: https://svn.argeo.org/slc/branches/0.6@846 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/main/java/org/argeo/slc/ant/AntRegistryUtil.java | 6 +++--- .../src/main/java/org/argeo/slc/ant/SlcProjectHelper.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/AntRegistryUtil.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/AntRegistryUtil.java index c73b59015..e15fedb15 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/AntRegistryUtil.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/AntRegistryUtil.java @@ -24,7 +24,7 @@ public class AntRegistryUtil { p.setBaseDir(antFile.getParentFile()); p.init(); ProjectHelper helper = new SlcProjectHelper(); - p.addReference("ant.projectHelper", helper); + p.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, helper); helper.parse(p, antFile); StructureRegistry registry = (StructureRegistry) p @@ -46,7 +46,7 @@ public class AntRegistryUtil { p.setBaseDir(antFile.getParentFile()); p.init(); ProjectHelper helper = new SlcProjectHelper(); - p.addReference("ant.projectHelper", helper); + p.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, helper); helper.parse(p, antFile); StructureRegistry registry = (StructureRegistry) p @@ -66,7 +66,7 @@ public class AntRegistryUtil { p.setBaseDir(antFile.getParentFile()); p.init(); ProjectHelper helper = new SlcProjectHelper(); - p.addReference("ant.projectHelper", helper); + p.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, helper); helper.parse(p, antFile); p.executeTarget(p.getDefaultTarget()); return p; diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java index 4cc2d9d39..15d78cc90 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java @@ -15,7 +15,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.helper.ProjectHelperImpl; +import org.apache.tools.ant.helper.ProjectHelper2; import org.argeo.slc.core.UnsupportedException; import org.argeo.slc.core.structure.DefaultSRegistry; @@ -27,7 +27,7 @@ import org.argeo.slc.core.structure.tree.TreeSPath; * Custom implementation of an Ant ProjectHelper binding a Spring * application context and a structure registry with the Ant project. */ -public class SlcProjectHelper extends ProjectHelperImpl { +public class SlcProjectHelper extends ProjectHelper2 { private static Log log; /** The Ant reference to the Spring application context used. */ -- 2.39.2