Remove old runtime

[gpl/argeo-slc.git] / org.argeo.slc.agent / src / main / java / org / argeo / slc / ant / AntRunner.java

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 5ce4b53b79794ed8bb5bfcec5522cadefa83413e..4bedc9bace8a0af2a255f78d6642315327afb150 100644 (file)
--- 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,12 +9,10 @@ import java.util.Vector;
 \r
 import org.apache.tools.ant.Project;\r
 import org.apache.tools.ant.ProjectHelper;\r
-import org.springframework.context.ApplicationContext;\r
+import org.apache.tools.ant.helper.ProjectHelper2;\r
 \r
-/** @deprecated */\r
+/** Run regular Ant script (that is, not SLC instrumented) */\r
 public class AntRunner {\r
-       private ApplicationContext context;\r
-       private ProjectHelper projectHelper;\r
        private URL buildFile;\r
        private String[] targets;\r
        private Properties properties;\r
@@ -23,25 +21,14 @@ public class AntRunner {
 \r
        }\r
 \r
-       public AntRunner(ApplicationContext context, ProjectHelper projectHelper,\r
-                       URL buildFile, String[] targets) {\r
-               super();\r
-               this.context = context;\r
-               this.projectHelper = projectHelper;\r
-               this.buildFile = buildFile;\r
-               this.targets = targets;\r
+       public AntRunner(URL buildFile, String target, Properties properties) {\r
+               this(buildFile, new String[] { target }, properties);\r
        }\r
 \r
-       public AntRunner(ApplicationContext context, URL buildFile, String target) {\r
-               super();\r
-               this.context = context;\r
-\r
-               BasicSlcProjectHelper basicSlcProjectHelper = new BasicSlcProjectHelper();\r
-               this.projectHelper = basicSlcProjectHelper;\r
-               basicSlcProjectHelper.setContext(context);\r
-\r
+       public AntRunner(URL buildFile, String[] targets, Properties properties) {\r
                this.buildFile = buildFile;\r
-               this.targets = new String[] { target };\r
+               this.targets = targets;\r
+               this.properties = properties;\r
        }\r
 \r
        public void run() {\r
@@ -52,6 +39,7 @@ public class AntRunner {
                p.setBaseDir(extractBaseDir(path));\r
 \r
                p.init();\r
+               ProjectHelper projectHelper = new ProjectHelper2();\r
                p.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, projectHelper);\r
                projectHelper.parse(p, buildFile);\r
 \r
@@ -100,9 +88,4 @@ public class AntRunner {
                }\r
        }\r
 \r
-       public static void main(String[] args) {\r
-               // TODO Auto-generated method stub\r
-\r
-       }\r
-\r
 }\r