X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2FAntRegistryUtil.java;h=634795e437e83297cec642eb56da9ab9d638389c;hb=0ee30b3cfd07a1e96eeb21ee729b2c7825585b94;hp=c73b59015303edc6b11383463891e0c341d4401c;hpb=faf680e212bf3e18837c4f798587856e061273b3;p=gpl%2Fargeo-slc.git

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