From 58db7291c1746d4e7623926f34108c07e2ccae4f Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 31 May 2008 15:12:59 +0000
Subject: [PATCH] Updates required by deploy

git-svn-id: https://svn.argeo.org/slc/trunk@1150 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.slc.core/pom.xml                          | 13 +++++++++----
 .../java/org/argeo/slc/ant/AntRegistryUtil.java     |  4 ++--
 .../src/test/resources/log4j.properties             |  3 +--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/org.argeo.slc.core/pom.xml b/org.argeo.slc.core/pom.xml
index cab5eb90e..45425d271 100644
--- a/org.argeo.slc.core/pom.xml
+++ b/org.argeo.slc.core/pom.xml
@@ -117,10 +117,15 @@
 			<artifactId>activation</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.apache.ant</groupId>
-			<artifactId>ant</artifactId>
-		</dependency>
+		<dependency>
+			<groupId>org.apache.ant</groupId>
+			<artifactId>ant</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.ant</groupId>
+			<artifactId>ant-commons-logging</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-io</artifactId>
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 6e6655d91..e81fb30eb 100644
--- 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;
 
 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.ProjectHelper;
-
+import org.apache.tools.ant.listener.CommonsLoggingListener;
 import org.argeo.slc.core.structure.StructurePath;
 import org.argeo.slc.core.structure.StructureRegistry;
 
@@ -85,6 +84,7 @@ public class AntRegistryUtil {
 		Project p = new Project();
 		p.setUserProperty("ant.file", url.toString());
 		// p.setBaseDir(url.toString());
+		p.addBuildListener(new CommonsLoggingListener());
 		p.init();
 		ProjectHelper helper = new SlcProjectHelper();
 		p.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, helper);
diff --git a/org.argeo.slc.core/src/test/resources/log4j.properties b/org.argeo.slc.core/src/test/resources/log4j.properties
index 93b015dc0..605a28c48 100644
--- 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
 
 ## Levels
 # Slc
-log4j.logger.org.argeo.slc=DEBUG
-log4j.logger.org.argeo.slc.unit=TRACE
+log4j.logger.org.argeo=DEBUG
 
 # Castor
 log4j.logger.org.exolab.castor=WARN
-- 
2.39.2