You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/10/17 05:08:37 UTC
svn commit: r585337 - in /cocoon/trunk:
core/cocoon-core/src/main/resources/META-INF/cocoon/properties/
core/cocoon-core/src/main/resources/META-INF/cocoon/properties/dev/
core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/
tools/archetypes/cocoon-22-ar...
Author: vgritsenko
Date: Tue Oct 16 20:08:33 2007
New Revision: 585337
URL: http://svn.apache.org/viewvc?rev=585337&view=rev
Log:
saner logging defaults: tone down spring messages a notch.
Modified:
cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/properties/core.properties
cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/properties/dev/core.properties
cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/log4j.xml
cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml
cocoon/trunk/tools/cocoon-maven-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/log4j.xml
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/properties/core.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/properties/core.properties?rev=585337&r1=585336&r2=585337&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/properties/core.properties (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/properties/core.properties Tue Oct 16 20:08:33 2007
@@ -120,4 +120,5 @@
# If you're using the Avalon bridge and the Log4J logger (which is the default
# logger for the Avalon bridge), then you can define the loglevel with this
# property.
-org.apache.cocoon.log4j.loglevel=error
\ No newline at end of file
+org.apache.cocoon.log4j.loglevel=error
+org.apache.cocoon.log4j.loglevel.spring=error
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/properties/dev/core.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/properties/dev/core.properties?rev=585337&r1=585336&r2=585337&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/properties/dev/core.properties (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/properties/dev/core.properties Tue Oct 16 20:08:33 2007
@@ -17,5 +17,8 @@
# Turn on debug logging
org.apache.cocoon.log4j.loglevel=debug
+# Tune down spring just a bit
+org.apache.cocoon.log4j.loglevel.spring=info
+
# Turn on reloading for all parts
org.apache.cocoon.reloading=true
Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/log4j.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/log4j.xml?rev=585337&r1=585336&r2=585337&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/log4j.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/log4j.xml Tue Oct 16 20:08:33 2007
@@ -16,23 +16,27 @@
limitations under the License.
-->
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
- <!-- This is a sample configuration for log4j.
- It simply just logs everything into a single
- log file.
- Note, that you can use properties for value substitution.
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+ <!--
+ - This is a sample configuration for log4j.
+ - It simply just logs everything into a single log file.
+ - Note, that you can use properties for value substitution.
-->
- <appender name="COCOON_DEFAULT" class="org.apache.log4j.FileAppender">
- <param name="File" value="${org.apache.cocoon.work.directory}/cocoon-logs/log4j.log" />
- <param name="Append" value="false" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%t %-5p %c{2} - %m%n"/>
- </layout>
- </appender>
+ <appender name="CORE" class="org.apache.log4j.FileAppender">
+ <param name="File" value="${org.apache.cocoon.work.directory}/cocoon-logs/log4j.log" />
+ <param name="Append" value="false" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p %t %c - %m%n"/>
+ </layout>
+ </appender>
+
+ <root>
+ <priority value="${org.apache.cocoon.log4j.loglevel}"/>
+ <appender-ref ref="CORE"/>
+ </root>
- <root>
- <priority value="${org.apache.cocoon.log4j.loglevel}"/>
- <appender-ref ref="COCOON_DEFAULT" />
- </root>
+ <logger name="org.springframework">
+ <level value="${org.apache.cocoon.log4j.loglevel.spring}"/>
+ </logger>
</log4j:configuration>
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml?rev=585337&r1=585336&r2=585337&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml Tue Oct 16 20:08:33 2007
@@ -16,24 +16,23 @@
limitations under the License.
-->
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
- <!-- This is a sample configuration for log4j.
- It simply just logs everything into a single
- log file.
- Note, that you can use properties for value substitution.
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+ <!--
+ - This is a sample configuration for log4j.
+ - It simply just logs everything into a single log file.
+ - Note, that you can use properties for value substitution.
-->
- <appender name="COCOON_DEFAULT" class="org.apache.log4j.FileAppender">
- <param name="File" value="${org.apache.cocoon.work.directory}/cocoon-logs/log4j.log" />
- <param name="Append" value="false" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%t %-5p %c{2} - %m%n"/>
- </layout>
- </appender>
+ <appender name="CORE" class="org.apache.log4j.FileAppender">
+ <param name="File" value="${org.apache.cocoon.work.directory}/cocoon-logs/log4j.log" />
+ <param name="Append" value="false" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p %t %c - %m%n"/>
+ </layout>
+ </appender>
- <root>
- <priority value="${org.apache.cocoon.log4j.loglevel}"/>
- <appender-ref ref="COCOON_DEFAULT" />
- </root>
-
+ <root>
+ <priority value="${org.apache.cocoon.log4j.loglevel}"/>
+ <appender-ref ref="CORE"/>
+ </root>
</log4j:configuration>
Modified: cocoon/trunk/tools/cocoon-maven-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/log4j.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-maven-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/log4j.xml?rev=585337&r1=585336&r2=585337&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-maven-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/log4j.xml (original)
+++ cocoon/trunk/tools/cocoon-maven-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/log4j.xml Tue Oct 16 20:08:33 2007
@@ -16,46 +16,45 @@
limitations under the License.
-->
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
- <!-- This is a sample configuration for log4j.
- It simply just logs everything into a single
- log file.
- Note, that you can use properties for value substitution.
- -->
- <appender name="COCOON_DEFAULT" class="org.apache.log4j.FileAppender">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+ <!--
+ - This is a sample configuration for log4j.
+ - It simply just logs everything into a single log file.
+ - Note, that you can use properties for value substitution.
+ -->
+ <appender name="CORE" class="org.apache.log4j.FileAppender">
<param name="File" value="./target/work/log/log4j.log"/>
<param name="Append" value="true"/>
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601} %t %-5p %c{2} - %m%n"/>
+ <param name="ConversionPattern" value="%d %t %-5p %c{2} - %m%n"/>
</layout>
</appender>
$if(useConsoleAppender)$
- <appender name="COCOON_DEFAULT_CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <appender name="CORE_CONSOLE" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%t %-5p %c{2} - %m%n"/>
+ <param name="ConversionPattern" value="%d %-5p %t %c - %m%n"/>
</layout>
</appender>
$endif$
$if(useSocketAppender)$
- <appender name="COCOON_DEFAULT_SOCKET" class="org.apache.log4j.SocketAppender">
+ <appender name="CORE_SOCKET" class="org.apache.log4j.SocketAppender">
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%t %-5p %c{2} - %m%n"/>
+ <param name="ConversionPattern" value="%d %-5p %t %c - %m%n"/>
</layout>
</appender>
$endif$
<root>
<priority value="\${org.apache.cocoon.log4j.loglevel}"/>
- <appender-ref ref="COCOON_DEFAULT" />
+ <appender-ref ref="CORE" />
$if(useConsoleAppender)$
- <appender-ref ref="COCOON_DEFAULT_CONSOLE" />
+ <appender-ref ref="CORE_CONSOLE"/>
$endif$
$if(useConsoleAppender)$
- <appender-ref ref="COCOON_DEFAULT_SOCKET" />
+ <appender-ref ref="CORE_SOCKET"/>
$endif$
</root>
-
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>