Update SLC

git-svn-id: https://svn.argeo.org/slc/trunk@838 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
index 6f805a784cb8e18d243070f3afbf3226bc767f2c..fcf7ad7f2d840ede1820af8c02b86f639e35eeb6 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
@@ -9,6 +9,8 @@ import java.util.StringTokenizer;
 \r
 import org.springframework.util.Log4jConfigurer;\r
 \r
+import org.apache.commons.logging.Log;\r
+import org.apache.commons.logging.LogFactory;\r
 import org.apache.tools.ant.Project;\r
 \r
 /**\r
@@ -152,10 +154,14 @@ public class SlcAntConfig {
                // pass the project properties through the System properties\r
                System.getProperties().putAll((Map<?, ?>) project.getUserProperties());\r
                Properties all = prepareAllProperties(slcRootFile);\r
+\r
+               Log log = LogFactory.getLog(this.getClass());\r
                for (Object o : all.keySet()) {\r
                        String key = o.toString();\r
-                       //System.out.println(key+"="+all.getProperty(key));\r
+                       // System.out.println(key+"="+all.getProperty(key));\r
                        if (project.getUserProperty(key) == null) {// not already set\r
+                               if (log.isDebugEnabled())\r
+                                       log.debug(key + "=" + all.getProperty(key));\r
                                project.setUserProperty(key, all.getProperty(key));\r
                        }\r
                }\r

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..b7d7365725cdb3bb6780cbb5bf47cc855f5048cf 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
@@ -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

diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/log4j.properties b/org.argeo.slc.example/exampleSlcAppli/conf/log4j.properties
index 63db0476d465d275f0faf5381e5f644750525c8b..b92b4cca706aee6a4cdaea54bcbf9f44b17230cb 100644 (file)
--- a/org.argeo.slc.example/exampleSlcAppli/conf/log4j.properties
+++ b/org.argeo.slc.example/exampleSlcAppli/conf/log4j.properties
@@ -3,7 +3,7 @@ log4j.rootLogger=INFO, console
 \r
 ## Levels\r
 # Slc\r
-log4j.logger.org.argeo.slc=DEBUG\r
+log4j.logger.org.argeo.slc=TRACE\r
 # Spring\r
 log4j.logger.org.springframework=INFO\r
 # Hibernate\r
@@ -19,5 +19,5 @@ log4j.appender.console=org.apache.log4j.ConsoleAppender
 \r
 # A1 uses PatternLayout.\r
 log4j.appender.console.layout=org.apache.log4j.PatternLayout\r
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c %F:%L%n\r
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n\r
 \r

diff --git a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ExampleIntegrationTest.java b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ExampleIntegrationTest.java
index 132de6544a40f8e5ec6fe206d0ea84dc060341f2..592d228d8a9a6b0fa8426272514bff42fab74ef3 100644 (file)
--- a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ExampleIntegrationTest.java
+++ b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ExampleIntegrationTest.java
@@ -25,9 +25,9 @@ public class ExampleIntegrationTest extends TestCase {
        private static Log log = LogFactory.getLog(ExampleIntegrationTest.class);\r
 \r
        /** Tests an end-to-end Ant run. */\r
-       public void testAllRunSimple() {\r
+       public void testAllRunSimple() throws Exception{\r
                String slcBase = System.getProperty("it.slc.base","exampleSlcAppli");\r
-               File slcBaseDir = new File(slcBase).getAbsoluteFile();\r
+               File slcBaseDir = new File(slcBase).getCanonicalFile();\r
                log.info("SLC base: " + slcBaseDir);\r
 \r
                String reportDirPath = slcBaseDir.getPath() + "/work/results/report/";\r