Inhtroduce basedon context

[gpl/argeo-slc.git] / org.argeo.slc.core / src / main / java / org / argeo / slc / ant / AntRegistryUtil.java

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..634795e437e83297cec642eb56da9ab9d638389c 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
@@ -57,8 +57,8 @@ public class AntRegistryUtil {
                return p;\r
        }\r
 \r
-       /** Executes all paths of the default target of the Ant file. */\r
-       public static Project runAll(File antFile) {\r
+       /** Executes all paths of the provided target of the Ant file. */\r
+       public static Project runAll(File antFile, String target) {\r
                if (log.isDebugEnabled())\r
                        log.debug("Runs all paths of Ant file " + antFile);\r
                Project p = new Project();\r
@@ -66,9 +66,14 @@ 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
+               p.executeTarget(target != null ? target : p.getDefaultTarget());\r
                return p;\r
        }\r
+\r
+       /** Executes all paths of the default target of the Ant file. */\r
+       public static Project runAll(File antFile) {\r
+               return runAll(antFile, null);\r
+       }\r
 }\r