import org.apache.commons.logging.LogFactory;\r
import org.apache.tools.ant.Project;\r
import org.apache.tools.ant.ProjectHelper;\r
-\r
+import org.apache.tools.ant.listener.CommonsLoggingListener;\r
import org.argeo.slc.core.structure.StructurePath;\r
import org.argeo.slc.core.structure.StructureRegistry;\r
\r
.getReference(SlcProjectHelper.REF_STRUCTURE_REGISTRY);\r
registry.setMode(StructureRegistry.ACTIVE);\r
registry.setActivePaths(activePaths);\r
- p.executeTarget(p.getDefaultTarget());\r
+\r
+ runProject(p, null);\r
return p;\r
}\r
\r
ProjectHelper helper = new SlcProjectHelper();\r
p.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, helper);\r
helper.parse(p, antFile);\r
- p.executeTarget(target != null ? target : p.getDefaultTarget());\r
+\r
+ runProject(p, target);\r
return p;\r
}\r
\r
log.debug("Runs all paths of Ant URL " + url);\r
Project p = new Project();\r
p.setUserProperty("ant.file", url.toString());\r
- //p.setBaseDir(url.toString());\r
+ // p.setBaseDir(url.toString());\r
+ p.addBuildListener(new CommonsLoggingListener());\r
p.init();\r
ProjectHelper helper = new SlcProjectHelper();\r
p.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, helper);\r
helper.parse(p, url);\r
- for(Map.Entry<Object, Object> entry : properties.entrySet()){\r
- p.setUserProperty(entry.getKey().toString(), entry.getValue().toString());\r
+\r
+ if (properties != null) {\r
+ for (Map.Entry<Object, Object> entry : properties.entrySet()) {\r
+ p.setUserProperty(entry.getKey().toString(), entry.getValue()\r
+ .toString());\r
+ }\r
}\r
- p.executeTarget(target != null ? target : p.getDefaultTarget());\r
+\r
+ runProject(p, target);\r
return p;\r
}\r
\r
public static Project runAll(File antFile) {\r
return runAll(antFile, null);\r
}\r
+\r
+ protected static void runProject(Project p, String target) {\r
+ p.fireBuildStarted();\r
+ Throwable exception = null;\r
+ try {\r
+ p.executeTarget(target != null ? target : p.getDefaultTarget());\r
+ } catch (Throwable e) {\r
+ exception = e;\r
+ log.error("Exception when running Ant: ",e);\r
+ } finally {\r
+ p.fireBuildFinished(exception);\r
+ }\r
+ }\r
}\r