Revert HSQL DB changes (still force shutdown, but reuse connection)

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

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 34373437d7cd2af7b5dfe99a03cbb4435a38bb62..07678c6ab1d16f2a4b6b9f619138605a076deab7 100644 (file)
--- 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;\r
 import java.io.IOException;\r
 import java.io.InputStream;\r
+import java.util.List;\r
 import java.util.Properties;\r
+import java.util.Vector;\r
 \r
-import org.springframework.context.ApplicationContext;\r
+import org.springframework.context.support.AbstractApplicationContext;\r
 import org.springframework.context.support.FileSystemXmlApplicationContext;\r
 \r
 import org.apache.commons.logging.Log;\r
@@ -15,7 +17,8 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.helper.ProjectHelperImpl;\r
 \r
 import org.argeo.slc.core.structure.DefaultSRegistry;\r
-import org.argeo.slc.core.structure.tree.TreeSElement;\r
+import org.argeo.slc.core.structure.SimpleSElement;\r
+import org.argeo.slc.core.structure.StructureRegistry;\r
 import org.argeo.slc.core.structure.tree.TreeSPath;\r
 \r
 /**\r
@@ -23,16 +26,17 @@ import org.argeo.slc.core.structure.tree.TreeSPath;
  * application context and a structure registry with the Ant project.\r
  */\r
 public class SlcProjectHelper extends ProjectHelperImpl {\r
-       private static Log log = LogFactory.getLog(SlcProjectHelper.class);\r
+       private static Log log ;\r
 \r
        public static String REF_ROOT_CONTEXT = "slcApplicationContext";\r
        public static String REF_STRUCTURE_REGISTRY = "slcStructureRegistry";\r
+       public static String REF_PROJECT_PATH = "slcProjectPath";\r
 \r
        private String slcRootFileName = "slcRoot.properties";\r
+       private String slcLocalFileName = "slcLocal.properties";\r
 \r
        @Override\r
        public void parse(Project project, Object source) throws BuildException {\r
-               log.debug("Entered SLC project helper");\r
 \r
                // look for root file\r
                File projectBaseDir = project.getBaseDir();\r
@@ -41,38 +45,79 @@ public class SlcProjectHelper extends ProjectHelperImpl {
                        throw new SlcAntException("Cannot find SLC root file");\r
                }\r
                SlcAntConfig.initProject(project, slcRootFile);\r
+               \r
+               if(log == null){\r
+                       // log4j is initialized only now\r
+                       log = LogFactory.getLog(SlcProjectHelper.class);\r
+               }\r
+               log.debug("SLC properties are set, starting initialization..");\r
 \r
                // init Spring application context\r
-               String acPath = project\r
-                               .getUserProperty(SlcAntConfig.APPLICATION_CONTEXT_PROPERTY);\r
-               ApplicationContext context = new FileSystemXmlApplicationContext(acPath);\r
-               project.addReference(REF_ROOT_CONTEXT, context);\r
-\r
-               // init structure register if it does not exist\r
+               initSpringContext(project);\r
+               \r
+               // init structure registry\r
                DefaultSRegistry registry = new DefaultSRegistry();\r
                project.addReference(REF_STRUCTURE_REGISTRY, registry);\r
 \r
                // call the underlying implementation to do the actual work\r
                super.parse(project, source);\r
 \r
+               // create structure root\r
+               registerProjectAndParents(project);\r
+\r
                addSlcTasks(project);\r
 \r
-               // create structure root\r
-               TreeSElement element = new TreeSElement(project.getDescription(),\r
-                               "Root");\r
-               registry.register(getProjectPath(project), element);\r
+       }\r
+\r
+       private void registerProjectAndParents(Project project) {\r
+               StructureRegistry registry = (StructureRegistry) project\r
+                               .getReference(REF_STRUCTURE_REGISTRY);\r
+               File rootDir = new File(project\r
+                               .getUserProperty(SlcAntConfig.ROOT_DIR_PROPERTY))\r
+                               .getAbsoluteFile();\r
+               File baseDir = project.getBaseDir().getAbsoluteFile();\r
+\r
+               List<File> dirs = new Vector<File>();\r
+               File currentDir = baseDir;\r
+               do {\r
+                       dirs.add(currentDir);\r
+                       currentDir = currentDir.getParentFile();\r
+                       log.trace("List " + currentDir);\r
+               } while (!currentDir.equals(rootDir.getParentFile()));\r
+\r
+               TreeSPath currPath = null;\r
+               for (int i = dirs.size() - 1; i >= 0; i--) {\r
+                       File dir = dirs.get(i);\r
+\r
+                       String description = dir.getName();\r
+                       File slcLocal = new File(dir.getPath() + File.separator\r
+                                       + slcLocalFileName);\r
+                       if (slcLocal.exists()) {\r
+                               Properties properties = SlcAntConfig.loadFile(slcLocal\r
+                                               .getAbsolutePath());\r
+                               description = properties\r
+                                               .getProperty(SlcAntConfig.DIR_DESCRIPTION_PROPERTY);\r
+                       } else {\r
+                               if (i == 0) {// project it self\r
+                                       description = project.getDescription() != null ? project\r
+                                                       .getDescription() : "";\r
+                               }\r
+                       }\r
+                       SimpleSElement element = new SimpleSElement(description);\r
 \r
+                       if (dir.equals(rootDir)) {\r
+                               currPath = TreeSPath.createRootPath(rootDir.getName());\r
+                       } else {\r
+                               currPath = currPath.createChild(dir.getName());\r
+                       }\r
+                       registry.register(currPath, element);\r
+               }\r
+               project.addReference(REF_PROJECT_PATH, currPath);\r
        }\r
 \r
        /** Get the path of a project (root). */\r
        public static TreeSPath getProjectPath(Project project) {\r
-               return TreeSPath.createRootPath(getProjectPathName(project));\r
-       }\r
-\r
-       private static String getProjectPathName(Project project) {\r
-               String projectName = project.getName() != null ? project.getName()\r
-                               : "project";\r
-               return projectName;\r
+               return (TreeSPath) project.getReference(REF_PROJECT_PATH);\r
        }\r
 \r
        private File findSlcRootFile(File dir) {\r
@@ -90,6 +135,15 @@ public class SlcProjectHelper extends ProjectHelperImpl {
                }\r
        }\r
 \r
+       private void initSpringContext(Project project) {\r
+               System.getProperties().putAll(project.getProperties());\r
+               String acPath = project\r
+                               .getUserProperty(SlcAntConfig.APPLICATION_CONTEXT_PROPERTY);\r
+               AbstractApplicationContext context = new FileSystemXmlApplicationContext(acPath);\r
+               context.registerShutdownHook();\r
+               project.addReference(REF_ROOT_CONTEXT, context);\r
+       }\r
+\r
        private void addSlcTasks(Project project) {\r
                Properties taskdefs = new Properties();\r
                try {\r