Updates required by deploy

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

diff --git a/org.argeo.slc.core/pom.xml b/org.argeo.slc.core/pom.xml
index cab5eb90e36310b11d6f4e22d23446cfe9d99c2d..45425d271146eb9c5d70b44442300409a7ca20c1 100644 (file)
--- a/org.argeo.slc.core/pom.xml
+++ b/org.argeo.slc.core/pom.xml
@@ -117,10 +117,15 @@
                        <artifactId>activation</artifactId>\r
                </dependency>\r
 \r
-               <dependency>\r
-                       <groupId>org.apache.ant</groupId>\r
-                       <artifactId>ant</artifactId>\r
-               </dependency>\r
+               <dependency>
+                       <groupId>org.apache.ant</groupId>
+                       <artifactId>ant</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.ant</groupId>
+                       <artifactId>ant-commons-logging</artifactId>
+               </dependency>
+
                <dependency>\r
                        <groupId>org.apache.commons</groupId>\r
                        <artifactId>commons-io</artifactId>\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/AntRegistryUtil.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/AntRegistryUtil.java
index 6e6655d9153759cc0d998a5620e675df619e6340..e81fb30eb42b69e84b2fdcdd66807395d88c78e1 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/AntRegistryUtil.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/AntRegistryUtil.java
@@ -8,10 +8,9 @@ import java.util.Properties;
 \r
 import org.apache.commons.logging.Log;\r
 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.ProjectHelper;\r
-\r
+import org.apache.tools.ant.listener.CommonsLoggingListener;\r
 import org.argeo.slc.core.structure.StructurePath;\r
 import org.argeo.slc.core.structure.StructureRegistry;\r
 \r
@@ -85,6 +84,7 @@ public class AntRegistryUtil {
                Project p = new Project();\r
                p.setUserProperty("ant.file", url.toString());\r
                // p.setBaseDir(url.toString());\r
+               p.addBuildListener(new CommonsLoggingListener());\r
                p.init();\r
                ProjectHelper helper = new SlcProjectHelper();\r
                p.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, helper);\r

diff --git a/org.argeo.slc.core/src/test/resources/log4j.properties b/org.argeo.slc.core/src/test/resources/log4j.properties
index 93b015dc0ac353908c498febb04bf67d1090c289..605a28c48be5be9da8b46f0c6ffda71185f41d81 100644 (file)
--- a/org.argeo.slc.core/src/test/resources/log4j.properties
+++ b/org.argeo.slc.core/src/test/resources/log4j.properties
@@ -3,8 +3,7 @@ log4j.rootLogger=INFO, console
 \r
 ## Levels\r
 # Slc\r
-log4j.logger.org.argeo.slc=DEBUG\r
-log4j.logger.org.argeo.slc.unit=TRACE\r
+log4j.logger.org.argeo=DEBUG\r
 \r
 # Castor\r
 log4j.logger.org.exolab.castor=WARN\r