From 90261b3fff8a7903f406c2600ea2969e9816a794 Mon Sep 17 00:00:00 2001
From: Julian Hochstetter <julian.hochstetter@mni.thm.de>
Date: Wed, 5 Sep 2012 11:37:18 +0200
Subject: [PATCH] switch over to log4j add servlet-api as provided dependency
---
pom.xml | 13 ++++++++++++-
src/main/resources/log4j.properties | 7 +++++++
src/main/webapp/WEB-INF/web.xml | 9 ++++++++-
3 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 src/main/resources/log4j.properties
diff --git a/pom.xml b/pom.xml
index 2a5fb510b..42d2c64e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,14 +88,25 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
<version>1.6.6</version>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
<dependency>
<groupId>couchdb4j</groupId>
<artifactId>couchdb4j</artifactId>
<version>0.3.0-i386-1</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
new file mode 100644
index 000000000..c5dd57f9f
--- /dev/null
+++ b/src/main/resources/log4j.properties
@@ -0,0 +1,7 @@
+log4j.rootCategory=INFO, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2}:%L - %m%n
+
+log4j.category.org.springframework.beans.factory=DEBUG
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index a55ad102b..5140b1f41 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -10,9 +10,16 @@
/WEB-INF/spring/spring-security.xml
</param-value>
</context-param>
+ <context-param>
+ <param-name>log4jConfigLocation</param-name>
+ <param-value>/WEB-INF/classes/log4j.properties</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
+ </listener>
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
+ </listener>
<servlet>
<servlet-name>arsnova</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
--
GitLab