From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 11 Dec 2007 18:54:17 +0000 (+0000)
Subject: Merge v0.6.1 bug fixes
X-Git-Tag: argeo-slc-2.1.7~3117
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=1d3c4fbd46a2dd4857fa5be4e88420d27be0147b;p=gpl%2Fargeo-slc.git

Merge v0.6.1 bug fixes

git-svn-id: https://svn.argeo.org/slc/trunk@848 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

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 b7d736572..6ed9d9190 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 <code>ProjectHelper</code> 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. */