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 c73b59015303edc6b11383463891e0c341d4401c..e15fedb15fb78965b252c8553cead8b9f7afaafd 100644 (file)
--- 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());\r
                p.init();\r
                ProjectHelper helper = new SlcProjectHelper();\r
-               p.addReference("ant.projectHelper", helper);\r
+               p.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, helper);\r
                helper.parse(p, antFile);\r
 \r
                StructureRegistry registry = (StructureRegistry) p\r
@@ -46,7 +46,7 @@ public class AntRegistryUtil {
                p.setBaseDir(antFile.getParentFile());\r
                p.init();\r
                ProjectHelper helper = new SlcProjectHelper();\r
-               p.addReference("ant.projectHelper", helper);\r
+               p.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, helper);\r
                helper.parse(p, antFile);\r
 \r
                StructureRegistry registry = (StructureRegistry) p\r
@@ -66,7 +66,7 @@ public class AntRegistryUtil {
                p.setBaseDir(antFile.getParentFile());\r
                p.init();\r
                ProjectHelper helper = new SlcProjectHelper();\r
-               p.addReference("ant.projectHelper", helper);\r
+               p.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, helper);\r
                helper.parse(p, antFile);\r
                p.executeTarget(p.getDefaultTarget());\r
                return p;\r

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 b7d7365725cdb3bb6780cbb5bf47cc855f5048cf..6ed9d9190fad04cf49790ae225899cbed92f30dc 100644 (file)
--- 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;\r
 import org.apache.tools.ant.BuildException;\r
 import org.apache.tools.ant.Project;\r
-import org.apache.tools.ant.helper.ProjectHelperImpl;\r
+import org.apache.tools.ant.helper.ProjectHelper2;\r
 \r
 import org.argeo.slc.core.UnsupportedException;\r
 import org.argeo.slc.core.structure.DefaultSRegistry;\r
@@ -27,7 +27,7 @@ import org.argeo.slc.core.structure.tree.TreeSPath;
  * Custom implementation of an Ant <code>ProjectHelper</code> binding a Spring\r
  * application context and a structure registry with the Ant project.\r
  */\r
-public class SlcProjectHelper extends ProjectHelperImpl {\r
+public class SlcProjectHelper extends ProjectHelper2 {\r
        private static Log log;\r
 \r
        /** The Ant reference to the Spring application context used. */\r