X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2FSlcProjectHelper.java;h=07678c6ab1d16f2a4b6b9f619138605a076deab7;hb=a29c28266fef35c1620f6582ec182bad7f7f85ae;hp=ecb46c07bf0f73822b3e618f0c8e92b7816857d1;hpb=af47cf1f193f9d9965d9e302e2712712ce623a50;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 ecb46c07b..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
@@ -3,9 +3,11 @@ package org.argeo.slc.ant;
 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.ApplicationContext;
+import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.FileSystemXmlApplicationContext;
 
 import org.apache.commons.logging.Log;
@@ -15,7 +17,8 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.helper.ProjectHelperImpl;
 
 import org.argeo.slc.core.structure.DefaultSRegistry;
-import org.argeo.slc.core.structure.tree.TreeSElement;
+import org.argeo.slc.core.structure.SimpleSElement;
+import org.argeo.slc.core.structure.StructureRegistry;
 import org.argeo.slc.core.structure.tree.TreeSPath;
 
 /**
@@ -23,16 +26,17 @@ import org.argeo.slc.core.structure.tree.TreeSPath;
  * application context and a structure registry with the Ant project.
  */
 public class SlcProjectHelper extends ProjectHelperImpl {
-	private static Log log = LogFactory.getLog(SlcProjectHelper.class);
+	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 {
-		log.debug("Entered SLC project helper");
 
 		// look for root file
 		File projectBaseDir = project.getBaseDir();
@@ -40,41 +44,80 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 		if (slcRootFile == null) {
 			throw new SlcAntException("Cannot find SLC root file");
 		}
-		SlcAntConfig slcAntConfig = new SlcAntConfig(project, slcRootFile);
+		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 = project
-				.getUserProperty(SlcAntConfig.APPLICATION_CONTEXT_PROPERTY);
-		ApplicationContext context = new FileSystemXmlApplicationContext(acPath);
-		project.addReference(REF_ROOT_CONTEXT, context);
-
-		// init structure register if it does not exist
+		initSpringContext(project);
+		
+		// init structure registry
 		DefaultSRegistry registry = new DefaultSRegistry();
 		project.addReference(REF_STRUCTURE_REGISTRY, registry);
 
 		// call the underlying implementation to do the actual work
 		super.parse(project, source);
 
-		addSlcTasks(project);
-		
 		// create structure root
-		String projectDescription = project.getDescription() != null ? project
-				.getDescription() : "Root";
-		TreeSElement element = TreeSElement.createRootElelment(
-				getProjectPathName(project), projectDescription);
-		registry.register(element);
+		registerProjectAndParents(project);
+
+		addSlcTasks(project);
 
 	}
 
-	/** Get the path of a project (root). */
-	public static TreeSPath getProjectPath(Project project) {
-		return TreeSPath.createChild(null, getProjectPathName(project));
+	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<File> dirs = new Vector<File>();
+		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);
 	}
 
-	private static String getProjectPathName(Project project) {
-		String projectName = project.getName() != null ? project.getName()
-				: "project";
-		return projectName;
+	/** 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) {
@@ -92,6 +135,15 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 		}
 	}
 
+	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 void addSlcTasks(Project project) {
 		Properties taskdefs = new Properties();
 		try {
@@ -109,7 +161,7 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 				project.addTaskDefinition(name, Class.forName(taskdefs
 						.getProperty(name)));
 			} catch (ClassNotFoundException e) {
-				log.error("Unknown class for task "+name, e);
+				log.error("Unknown class for task " + name, e);
 			}
 		}
 	}