# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1273047507 0
# Node ID 090d8331e5fda967e852276dbb86e68ad4ff7260
# Parent  bb3ffe7d719e019e55253c18051625f4ca94eb96
Adapted some configuration files.

gnv/trunk@1057 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r bb3ffe7d719e -r 090d8331e5fd gnv/ChangeLog
--- a/gnv/ChangeLog	Wed Apr 28 16:18:30 2010 +0000
+++ b/gnv/ChangeLog	Wed May 05 08:18:27 2010 +0000
@@ -1,3 +1,11 @@
+2010-05-05  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	* src/main/webapp/WEB-INF/web.xml: Removed useless log4j configuration
+	  section.
+
+	* src/main/webapp/WEB-INF/classes/log4j.properties: Adapted logging
+	  configuration for a productive system.
+
 2010-04-28  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	* Changes, NEWS, ChangeLog: Summarized changes.
diff -r bb3ffe7d719e -r 090d8331e5fd gnv/src/main/webapp/WEB-INF/classes/log4j.properties
--- a/gnv/src/main/webapp/WEB-INF/classes/log4j.properties	Wed Apr 28 16:18:30 2010 +0000
+++ b/gnv/src/main/webapp/WEB-INF/classes/log4j.properties	Wed May 05 08:18:27 2010 +0000
@@ -1,20 +1,15 @@
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=DEBUG, A1
-log4j.rootLogger=DEBUG, BSH
+#### Log just errors and warnings to a file.
+log4j.rootLogger=WARN, BSH
 
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
+#### Log everything to a file.
+#log4j.rootLogger=DEBUG, BSH
 
 log4j.appender.BSH=org.apache.log4j.RollingFileAppender
 log4j.appender.BSH.File=${catalina.base}/logs/gnv.log
 log4j.appender.BSH.layout=org.apache.log4j.PatternLayout
 log4j.appender.BSH.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
 
-# Abschalten des geschwätzigen Loggings in dre Klasse JspServlet
+# set WARN log level for following packages to reduce output.
 log4j.category.org.apache.jasper=WARN
 log4j.category.org.apache.catalina=WARN
 log4j.category.org.apache.commons=WARN
diff -r bb3ffe7d719e -r 090d8331e5fd gnv/src/main/webapp/WEB-INF/web.xml
--- a/gnv/src/main/webapp/WEB-INF/web.xml	Wed Apr 28 16:18:30 2010 +0000
+++ b/gnv/src/main/webapp/WEB-INF/web.xml	Wed May 05 08:18:27 2010 +0000
@@ -15,15 +15,6 @@
             <param-value>/WEB-INF/config/struts-config.xml</param-value>
         </init-param>
         
-        <!--  The Log4J Configuration, relative to the Project-Folder,
-              which should be used in this Project.  -->
-        <!--
-        <init-param>
-            <param-name>de.intevation.gnv.servlet.log4j.configuration</param-name>
-            <param-value>WEB-INF/config/log4j.properties</param-value>
-        </init-param>
-        -->
-        
         <!--  The Number of ArtifacDatabases which are configured in this Document. -->
         <init-param>
             <param-name>de.intevation.gnv.artifactdatabase.client.ArtifactDatabase.count</param-name>