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=f9928708a23e20086301f8a742e6a384813212d3;hb=e705b3804cd22f56dec2ca69db3de83a53ab010a;hp=e15fedb15fb78965b252c8553cead8b9f7afaafd;hpb=1d3c4fbd46a2dd4857fa5be4e88420d27be0147b;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 e15fedb15..f9928708a 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
@@ -1,10 +1,14 @@
 package org.argeo.slc.ant;
 
 import java.io.File;
+import java.net.URL;
 import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 
 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.ProjectHelper;
 
@@ -53,12 +57,13 @@ public class AntRegistryUtil {
 				.getReference(SlcProjectHelper.REF_STRUCTURE_REGISTRY);
 		registry.setMode(StructureRegistry.ACTIVE);
 		registry.setActivePaths(activePaths);
-		p.executeTarget(p.getDefaultTarget());
+
+		runProject(p, null);
 		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();
@@ -68,7 +73,48 @@ public class AntRegistryUtil {
 		ProjectHelper helper = new SlcProjectHelper();
 		p.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, helper);
 		helper.parse(p, antFile);
-		p.executeTarget(p.getDefaultTarget());
+
+		runProject(p, target);
+		return p;
+	}
+
+	/** Executes all paths of the provided target of the Ant URL. */
+	public static Project runAll(URL url, String target, Properties properties) {
+		if (log.isDebugEnabled())
+			log.debug("Runs all paths of Ant URL " + url);
+		Project p = new Project();
+		p.setUserProperty("ant.file", url.toString());
+		// p.setBaseDir(url.toString());
+		p.init();
+		ProjectHelper helper = new SlcProjectHelper();
+		p.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, helper);
+		helper.parse(p, url);
+
+		if (properties != null) {
+			for (Map.Entry<Object, Object> entry : properties.entrySet()) {
+				p.setUserProperty(entry.getKey().toString(), entry.getValue()
+						.toString());
+			}
+		}
+
+		runProject(p, target);
 		return p;
 	}
+
+	/** Executes all paths of the default target of the Ant file. */
+	public static Project runAll(File antFile) {
+		return runAll(antFile, null);
+	}
+
+	protected static void runProject(Project p, String target) {
+		p.fireBuildStarted();
+		Throwable exception = null;
+		try {
+			p.executeTarget(target != null ? target : p.getDefaultTarget());
+		} catch (Throwable e) {
+			exception = e;
+		} finally {
+			p.fireBuildFinished(exception);
+		}
+	}
 }