X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2FSlcProjectHelper.java;h=6ed9d9190fad04cf49790ae225899cbed92f30dc;hb=6045cf4f30c0df343c0625bd4815584ff9a4b805;hp=4cc2d9d39d84b26e193980d17198a20f609ecf72;hpb=faf680e212bf3e18837c4f798587856e061273b3;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
index 4cc2d9d39..6ed9d9190 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
@@ -15,7 +15,7 @@ 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.apache.tools.ant.helper.ProjectHelper2;
 
 import org.argeo.slc.core.UnsupportedException;
 import org.argeo.slc.core.structure.DefaultSRegistry;
@@ -27,7 +27,7 @@ import org.argeo.slc.core.structure.tree.TreeSPath;
  * Custom implementation of an Ant <code>ProjectHelper</code> binding a Spring
  * application context and a structure registry with the Ant project.
  */
-public class SlcProjectHelper extends ProjectHelperImpl {
+public class SlcProjectHelper extends ProjectHelper2 {
 	private static Log log;
 
 	/** The Ant reference to the Spring application context used. */
@@ -137,8 +137,12 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 		System.getProperties().putAll((Map<?, ?>) project.getProperties());
 		String acPath = project
 				.getUserProperty(SlcAntConfig.APPLICATION_CONTEXT_PROPERTY);
+		if (log.isDebugEnabled())
+			log.debug("Loading Spring application context from " + acPath);
+		// FIXME: workaround to the removal of leading '/' by Spring
+		// use URL instead?
 		AbstractApplicationContext context = new FileSystemXmlApplicationContext(
-				acPath);
+				'/'+acPath);
 		context.registerShutdownHook();
 		project.addReference(REF_ROOT_CONTEXT, context);
 	}