diff --git a/pom.xml b/pom.xml index 2a5fb510be99e59cc75edbc68ca0956b154c5ea1..42d2c64e2bf0869e9f50fce0e157c458a9418fb4 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 0000000000000000000000000000000000000000..c5dd57f9fd96542358fee960297c1ba11e22ee45 --- /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 a55ad102bb0c0b35f64946ddb888f70b00375af5..5140b1f41c5126bd2069072486d425680d619778 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>