Modifications required for web

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

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