X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2FSlcProjectHelper.java;h=07678c6ab1d16f2a4b6b9f619138605a076deab7;hb=a29c28266fef35c1620f6582ec182bad7f7f85ae;hp=79160073b66ae6d79e919dbacfa34a30ecdd1297;hpb=40768ea8b087bc653a49c2400045f4c191e8e3b4;p=gpl%2Fargeo-slc.git
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
index 79160073b..07678c6ab 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
@@ -1,58 +1,168 @@
package org.argeo.slc.ant;
-import org.springframework.context.ApplicationContext;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Properties;
+import java.util.Vector;
+
+import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.FileSystemXmlApplicationContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.helper.ProjectHelperImpl;
-import org.argeo.slc.core.structure.tree.TreeSElement;
+import org.argeo.slc.core.structure.DefaultSRegistry;
+import org.argeo.slc.core.structure.SimpleSElement;
+import org.argeo.slc.core.structure.StructureRegistry;
import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.core.structure.tree.TreeSRegistry;
+/**
+ * Custom implementation of a ProjectHelper
binding a Spring
+ * application context and a structure registry with the Ant project.
+ */
public class SlcProjectHelper extends ProjectHelperImpl {
- public static String PROP_APPLICATION_CONTEXT = "org.argeo.slc.slcRootContext";
- //public static String PROP_REGISTRY_MODE = "org.argeo.slc.slcRegistryMode";
+ private static Log log ;
+
public static String REF_ROOT_CONTEXT = "slcApplicationContext";
public static String REF_STRUCTURE_REGISTRY = "slcStructureRegistry";
+ public static String REF_PROJECT_PATH = "slcProjectPath";
+
+ private String slcRootFileName = "slcRoot.properties";
+ private String slcLocalFileName = "slcLocal.properties";
@Override
public void parse(Project project, Object source) throws BuildException {
- stdOut("Entered SLC project helper");
+
+ // look for root file
+ File projectBaseDir = project.getBaseDir();
+ File slcRootFile = findSlcRootFile(projectBaseDir);
+ if (slcRootFile == null) {
+ throw new SlcAntException("Cannot find SLC root file");
+ }
+ SlcAntConfig.initProject(project, slcRootFile);
+
+ if(log == null){
+ // log4j is initialized only now
+ log = LogFactory.getLog(SlcProjectHelper.class);
+ }
+ log.debug("SLC properties are set, starting initialization..");
// init Spring application context
- String acPath = System.getProperty(PROP_APPLICATION_CONTEXT,
- "applicationContext.xml");
- ApplicationContext context = new FileSystemXmlApplicationContext(acPath);
- project.addReference(REF_ROOT_CONTEXT, context);
+ initSpringContext(project);
+
+ // init structure registry
+ DefaultSRegistry registry = new DefaultSRegistry();
+ project.addReference(REF_STRUCTURE_REGISTRY, registry);
- // init structure register if it does not exist
- TreeSRegistry registry = new TreeSRegistry();
- project.addReference(REF_STRUCTURE_REGISTRY, registry);
+ // call the underlying implementation to do the actual work
+ super.parse(project, source);
- // call the underlying implementation to do the actual work
- super.parse(project, source);
+ // create structure root
+ registerProjectAndParents(project);
+
+ addSlcTasks(project);
- String projectDescription = project.getDescription() != null ? project
- .getDescription()
- : "Root";
- TreeSElement element = TreeSElement.createRootElelment(
- getProjectPathName(project), projectDescription);
- registry.register(element);
}
- private static void stdOut(Object o) {
- System.out.println(o);
+ private void registerProjectAndParents(Project project) {
+ StructureRegistry registry = (StructureRegistry) project
+ .getReference(REF_STRUCTURE_REGISTRY);
+ File rootDir = new File(project
+ .getUserProperty(SlcAntConfig.ROOT_DIR_PROPERTY))
+ .getAbsoluteFile();
+ File baseDir = project.getBaseDir().getAbsoluteFile();
+
+ List dirs = new Vector();
+ File currentDir = baseDir;
+ do {
+ dirs.add(currentDir);
+ currentDir = currentDir.getParentFile();
+ log.trace("List " + currentDir);
+ } while (!currentDir.equals(rootDir.getParentFile()));
+
+ TreeSPath currPath = null;
+ for (int i = dirs.size() - 1; i >= 0; i--) {
+ File dir = dirs.get(i);
+
+ String description = dir.getName();
+ File slcLocal = new File(dir.getPath() + File.separator
+ + slcLocalFileName);
+ if (slcLocal.exists()) {
+ Properties properties = SlcAntConfig.loadFile(slcLocal
+ .getAbsolutePath());
+ description = properties
+ .getProperty(SlcAntConfig.DIR_DESCRIPTION_PROPERTY);
+ } else {
+ if (i == 0) {// project it self
+ description = project.getDescription() != null ? project
+ .getDescription() : "";
+ }
+ }
+ SimpleSElement element = new SimpleSElement(description);
+
+ if (dir.equals(rootDir)) {
+ currPath = TreeSPath.createRootPath(rootDir.getName());
+ } else {
+ currPath = currPath.createChild(dir.getName());
+ }
+ registry.register(currPath, element);
+ }
+ project.addReference(REF_PROJECT_PATH, currPath);
+ }
+
+ /** Get the path of a project (root). */
+ public static TreeSPath getProjectPath(Project project) {
+ return (TreeSPath) project.getReference(REF_PROJECT_PATH);
+ }
+
+ private File findSlcRootFile(File dir) {
+ for (File file : dir.listFiles()) {
+ if (!file.isDirectory() && file.getName().equals(slcRootFileName)) {
+ return file;
+ }
+ }
+
+ File parentDir = dir.getParentFile();
+ if (parentDir == null) {
+ return null;// stop condition: not found
+ } else {
+ return findSlcRootFile(parentDir);
+ }
}
- static TreeSPath getProjectPath(Project project) {
- return TreeSPath.createChild(null, getProjectPathName(project));
+ private void initSpringContext(Project project) {
+ System.getProperties().putAll(project.getProperties());
+ String acPath = project
+ .getUserProperty(SlcAntConfig.APPLICATION_CONTEXT_PROPERTY);
+ AbstractApplicationContext context = new FileSystemXmlApplicationContext(acPath);
+ context.registerShutdownHook();
+ project.addReference(REF_ROOT_CONTEXT, context);
}
- private static String getProjectPathName(Project project) {
- String projectName = project.getName() != null ? project.getName()
- : "project";
- return projectName;
+ private void addSlcTasks(Project project) {
+ Properties taskdefs = new Properties();
+ try {
+ InputStream in = project.getClass().getResourceAsStream(
+ "/org/argeo/slc/ant/taskdefs.properties");
+ taskdefs.load(in);
+ in.close();
+ } catch (IOException e) {
+ throw new SlcAntException("Cannot load task definitions", e);
+ }
+
+ for (Object o : taskdefs.keySet()) {
+ String name = o.toString();
+ try {
+ project.addTaskDefinition(name, Class.forName(taskdefs
+ .getProperty(name)));
+ } catch (ClassNotFoundException e) {
+ log.error("Unknown class for task " + name, e);
+ }
+ }
}
}