Author: tchemit Date: 2012-01-05 12:04:49 +0100 (Thu, 05 Jan 2012) New Revision: 239 Url: http://forge.codelutin.com/repositories/revision/echobase/239 Log: fix log configuration Added: trunk/echobase-ui/src/main/env/dev/resources/log4j.xml trunk/echobase-ui/src/main/env/prod/resources/log4j.xml Removed: trunk/echobase-ui/src/main/env/dev/resources/log4j.properties trunk/echobase-ui/src/main/env/prod/resources/log4j.properties trunk/echobase-ui/src/main/webapp/WEB-INF/log4j.xml Modified: trunk/echobase-ui/pom.xml Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-01-05 10:42:31 UTC (rev 238) +++ trunk/echobase-ui/pom.xml 2012-01-05 11:04:49 UTC (rev 239) @@ -255,6 +255,7 @@ <directory>src/main/env/${env}/resources</directory> <includes> <include>*.properties</include> + <include>*.xml</include> </includes> </resource> </resources> @@ -403,7 +404,7 @@ <systemProperties> <systemProperty> <name>echobase.log.dir</name> - <value>/var/local/echobase/log</value> + <value>/var/local/echobase/logs</value> </systemProperty> </systemProperties> </configuration> Deleted: trunk/echobase-ui/src/main/env/dev/resources/log4j.properties =================================================================== --- trunk/echobase-ui/src/main/env/dev/resources/log4j.properties 2012-01-05 10:42:31 UTC (rev 238) +++ trunk/echobase-ui/src/main/env/dev/resources/log4j.properties 2012-01-05 11:04:49 UTC (rev 239) @@ -1,38 +0,0 @@ -### -# #%L -# EchoBase :: UI -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2011 Ifremer, Codelutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout - -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%t] %d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n - -# package level -log4j.logger.fr.ifremer.echobase=INFO -log4j.logger.org.nuiton=WARN -log4j.logger.org.nuiton.topia.migration=INFO -log4j.logger.org.nuiton.topia.replication=INFO -log4j.logger.com.opensymphony.xwork2.util.logging.commons.CommonsLogger=ERROR -log4j.logger.org.apache.struts2.util.TokenHelper=ERROR Copied: trunk/echobase-ui/src/main/env/dev/resources/log4j.xml (from rev 238, trunk/echobase-ui/src/main/webapp/WEB-INF/log4j.xml) =================================================================== --- trunk/echobase-ui/src/main/env/dev/resources/log4j.xml (rev 0) +++ trunk/echobase-ui/src/main/env/dev/resources/log4j.xml 2012-01-05 11:04:49 UTC (rev 239) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE log4j:configuration SYSTEM + "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd"> +<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'> + + <!-- ================================= --> + <!-- Preserve messages in a local file --> + <!-- ================================= --> + + <!-- A time/date based rolling appender --> + <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> + <param name="File" value="${echobase.log.dir}/echobase.log"/> + <param name="Append" value="false"/> + <param name="DatePattern" value="'.'yyyy-MM-dd"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> + </layout> + </appender> + + <!-- ============================== --> + <!-- Append messages to the console --> + <!-- ============================== --> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" + value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + + <logger name="org.nuiton"> + <level value="WARN"/> + </logger> + + <root> + <priority value="INFO"/> + <appender-ref ref="FILE"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Deleted: trunk/echobase-ui/src/main/env/prod/resources/log4j.properties =================================================================== --- trunk/echobase-ui/src/main/env/prod/resources/log4j.properties 2012-01-05 10:42:31 UTC (rev 238) +++ trunk/echobase-ui/src/main/env/prod/resources/log4j.properties 2012-01-05 11:04:49 UTC (rev 239) @@ -1,36 +0,0 @@ -### -# #%L -# EchoBase :: UI -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2011 Ifremer, Codelutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -# Global logging configuration -log4j.rootLogger=ERROR, stdout - -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n - -log4j.logger.fr.ifremer.echobase=INFO -log4j.logger.org.nuiton.topia.migration=INFO -log4j.logger.org.nuiton.topia.replication=INFO -log4j.logger.com.opensymphony.xwork2.util.logging.commons.CommonsLogger=ERROR -log4j.logger.org.apache.struts2.util.TokenHelper=ERROR Added: trunk/echobase-ui/src/main/env/prod/resources/log4j.xml =================================================================== --- trunk/echobase-ui/src/main/env/prod/resources/log4j.xml (rev 0) +++ trunk/echobase-ui/src/main/env/prod/resources/log4j.xml 2012-01-05 11:04:49 UTC (rev 239) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE log4j:configuration SYSTEM + "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd"> +<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/' + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jakarta.apache.org/log4j/ "> + + <!-- ================================= --> + <!-- Preserve messages in a local file --> + <!-- ================================= --> + + <!-- A time/date based rolling appender --> + <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> + <param name="File" value="${echobase.log.dir}/echobase.log"/> + <param name="Append" value="false"/> + <param name="DatePattern" value="'.'yyyy-MM-dd"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> + </layout> + </appender> + + <!-- ============================== --> + <!-- Append messages to the console --> + <!-- ============================== --> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" + value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + + <logger name="org.nuiton"> + <level value="WARN"/> + </logger> + + <logger name="fr.ifremer"> + <level value="INFO"/> + </logger> + + <root> + <priority value="ERROR"/> + <appender-ref ref="FILE"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/log4j.xml =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/log4j.xml 2012-01-05 10:42:31 UTC (rev 238) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/log4j.xml 2012-01-05 11:04:49 UTC (rev 239) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE log4j:configuration SYSTEM "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd"> -<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'> - - <!-- ================================= --> - <!-- Preserve messages in a local file --> - <!-- ================================= --> - - <!-- A time/date based rolling appender --> - <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="File" value="${echobase.log.dir}/echobase.log"/> - <param name="Append" value="false"/> - <param name="DatePattern" value="'.'yyyy-MM-dd"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> - </layout> - </appender> - - <!-- ============================== --> - <!-- Append messages to the console --> - <!-- ============================== --> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> - <!-- The default pattern: Date Priority [Category] Message\n --> - <param name="ConversionPattern" - value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - - <logger name="org.apache.shiro.realm.AuthorizingRealm"> - <level value="WARN"/> - </logger> - - <root> - <priority value="INFO"/> - <appender-ref ref="FILE"/> - <appender-ref ref="CONSOLE"/> - </root> - -</log4j:configuration>