X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2FAntRunner.java;h=1adb21058def17953382d3c1bd6f966545ccc39b;hb=489db3e2297debe1a32e5e98534d5dbf059e1c1d;hp=09de703d8104411096d56712f7e969020f84eae1;hpb=847af36ba908ea3285a16e17d809a2b29f207b0a;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntRunner.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntRunner.java
index 09de703d8..1adb21058 100644
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntRunner.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntRunner.java
@@ -9,11 +9,11 @@ import java.util.Vector;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectHelper;
-import org.springframework.context.ApplicationContext;
+import org.apache.tools.ant.helper.ProjectHelper2;
+import org.argeo.slc.core.SlcException;
 
+/** Run regular Ant script (that is, not SLC instrumented) */
 public class AntRunner {
-	private ApplicationContext context;
-	private ProjectHelper projectHelper;
 	private URL buildFile;
 	private String[] targets;
 	private Properties properties;
@@ -22,25 +22,14 @@ public class AntRunner {
 
 	}
 
-	public AntRunner(ApplicationContext context, ProjectHelper projectHelper,
-			URL buildFile, String[] targets) {
-		super();
-		this.context = context;
-		this.projectHelper = projectHelper;
-		this.buildFile = buildFile;
-		this.targets = targets;
+	public AntRunner(URL buildFile, String target, Properties properties) {
+		this(buildFile, new String[] { target }, properties);
 	}
 
-	public AntRunner(ApplicationContext context, URL buildFile, String target) {
-		super();
-		this.context = context;
-
-		BasicSlcProjectHelper basicSlcProjectHelper = new BasicSlcProjectHelper();
-		this.projectHelper = basicSlcProjectHelper;
-		basicSlcProjectHelper.setContext(context);
-
+	public AntRunner(URL buildFile, String[] targets, Properties properties) {
 		this.buildFile = buildFile;
-		this.targets = new String[] { target };
+		this.targets = targets;
+		this.properties = properties;
 	}
 
 	public void run() {
@@ -51,6 +40,7 @@ public class AntRunner {
 		p.setBaseDir(extractBaseDir(path));
 
 		p.init();
+		ProjectHelper projectHelper = new ProjectHelper2();
 		p.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, projectHelper);
 		projectHelper.parse(p, buildFile);
 
@@ -71,8 +61,7 @@ public class AntRunner {
 			}
 		} catch (Throwable e) {
 			exception = e;
-			throw new SlcAntException("Could not run Ant script " + buildFile,
-					e);
+			throw new SlcException("Could not run Ant script " + buildFile, e);
 		} finally {
 			p.fireBuildFinished(exception);
 		}
@@ -99,9 +88,4 @@ public class AntRunner {
 		}
 	}
 
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-
-	}
-
 }