import java.io.File;\r
import java.net.URL;\r
import java.util.Arrays;\r
-import java.util.Collections;\r
import java.util.Map;\r
import java.util.Properties;\r
import java.util.Vector;\r
\r
-import org.springframework.context.ApplicationContext;\r
-\r
import org.apache.tools.ant.Project;\r
import org.apache.tools.ant.ProjectHelper;\r
+import org.apache.tools.ant.helper.ProjectHelper2;\r
+import org.argeo.slc.core.SlcException;\r
\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
\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
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
}\r
} catch (Throwable e) {\r
exception = e;\r
- throw new SlcAntException("Could not run Ant script " + buildFile,\r
- e);\r
+ throw new SlcException("Could not run Ant script " + buildFile, e);\r
} finally {\r
p.fireBuildFinished(exception);\r
}\r
}\r
}\r
\r
- public static void main(String[] args) {\r
- // TODO Auto-generated method stub\r
-\r
- }\r
-\r
}\r