Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Remove logback, reverting to log4j
Browse files Browse the repository at this point in the history
log4j-over-slf4j doesn't implement addAppender/removeAppender, which
we use, thus causing our tests to break with
IncompatibleClassChangeError.
  • Loading branch information
seanf committed Dec 13, 2012
1 parent e45068d commit 07a5add
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 55 deletions.
21 changes: 7 additions & 14 deletions zanata-war/pom.xml
Expand Up @@ -953,13 +953,6 @@

<dependencies>

<!-- This needs to appear before log4j and before jboss-embedded-all -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<scope>test</scope>
</dependency>

<!-- Zanata-specific dependencies -->

<dependency>
Expand Down Expand Up @@ -1215,12 +1208,6 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-log4j</artifactId>
Expand Down Expand Up @@ -1350,6 +1337,12 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
Expand Down Expand Up @@ -1465,7 +1458,7 @@

<!-- Testing dependencies -->

<dependency>
<dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
<version>${jboss.embedded.version}</version>
Expand Down
24 changes: 24 additions & 0 deletions zanata-war/src/test/resources/log4j.xml
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd" >
<log4j:configuration>
<appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
<param name="threshold" value="info"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p [%c{1}] - %m%n" />
</layout>
</appender>
<appender name="FILE" class="org.apache.log4j.RollingFileAppender">
<param name="file" value="target/test.log"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %-5p [%c] - %m%n" />
</layout>
</appender>
<logger name="org.hibernate">
<level value="info" />
</logger>
<root>
<level value="debug" />
<appender-ref ref="STDOUT" />
<appender-ref ref="FILE" />
</root>
</log4j:configuration>
41 changes: 0 additions & 41 deletions zanata-war/src/test/resources/logback.groovy

This file was deleted.

0 comments on commit 07a5add

Please sign in to comment.