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=e81fb30eb42b69e84b2fdcdd66807395d88c78e1;hb=fb1f473a0fa4f3b11ebbf7a676983ea946fbdac0;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..e81fb30eb 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,13 +1,16 @@
 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.Project;
 import org.apache.tools.ant.ProjectHelper;
-
+import org.apache.tools.ant.listener.CommonsLoggingListener;
 import org.argeo.slc.core.structure.StructurePath;
 import org.argeo.slc.core.structure.StructureRegistry;
 
@@ -24,7 +27,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,19 +49,20 @@ 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
 				.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();
@@ -66,9 +70,52 @@ 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());
+
+		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.addBuildListener(new CommonsLoggingListener());
+		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;
+			log.error("Exception when running Ant: ",e);
+		} finally {
+			p.fireBuildFinished(exception);
+		}
+	}
 }