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=f17e0d5a3bbf5ead5ca98a69a7a4f6047fb55cac;hpb=7756b44bff90cc8cb20e16e426c39f82ba89705e;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 f17e0d5a3..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
@@ -7,8 +7,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Vector;
 
-import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
-import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.FileSystemXmlApplicationContext;
 
 import org.apache.commons.logging.Log;
@@ -27,7 +26,7 @@ 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";
@@ -38,7 +37,6 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 
 	@Override
 	public void parse(Project project, Object source) throws BuildException {
-		log.debug("Entered SLC project helper");
 
 		// look for root file
 		File projectBaseDir = project.getBaseDir();
@@ -47,6 +45,12 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 			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
 		initSpringContext(project);
@@ -135,7 +139,8 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 		System.getProperties().putAll(project.getProperties());
 		String acPath = project
 				.getUserProperty(SlcAntConfig.APPLICATION_CONTEXT_PROPERTY);
-		ApplicationContext context = new FileSystemXmlApplicationContext(acPath);
+		AbstractApplicationContext context = new FileSystemXmlApplicationContext(acPath);
+		context.registerShutdownHook();
 		project.addReference(REF_ROOT_CONTEXT, context);
 	}