Author: lgawron
Date: Thu Apr 14 06:43:23 2005
New Revision: 161281
URL: http://svn.apache.org/viewcvs?view=rev&rev=161281
Log:
make log appending configurable at build time
Modified:
cocoon/trunk/build.properties
cocoon/trunk/src/webapp/WEB-INF/logkit.xconf
cocoon/trunk/tools/targets/init-build.xml
Modified: cocoon/trunk/build.properties
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/build.properties?view=diff&r1=161280&r2=161281
==============================================================================
--- cocoon/trunk/build.properties (original)
+++ cocoon/trunk/build.properties Thu Apr 14 06:43:23 2005
@@ -117,6 +117,7 @@
build.webapp.docs=${build.webapp}/docs
build.webapp.javadocs=${build.webapp}/api/java
build.webapp.loglevel=INFO
+build.webapp.logappend=false
build.war=${build}/${name}.war
# ---- Standalone-demo Build Properties
----------------------------------------
Modified: cocoon/trunk/src/webapp/WEB-INF/logkit.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/logkit.xconf?view=diff&r1=161280&r2=161281
==============================================================================
--- cocoon/trunk/src/webapp/WEB-INF/logkit.xconf (original)
+++ cocoon/trunk/src/webapp/WEB-INF/logkit.xconf Thu Apr 14 06:43:23 2005
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+ÃÂÂ<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2004 The Apache Software Foundation
@@ -66,19 +66,23 @@
| <format> indicates how the log event should be serialized.
| Note that newlines are *not* automatic: you have to specify the
| newline as '\n' or everything will appear on a single line!
+ |
| The first format below is less verbose because it won't print out
| the error stacktrace (which tend to be very verbose and for little
value).
| If you need the stacktraces, uncomment the second format below.
+ |
+ | Please mind that the default format logs request uri along with
+ | query string. This may log confidential data (passwords etc.).
+-->
- <format type="cocoon">%5.5{priority} %{time} [%{category}] (%{uri})
%{thread}/%{class:short}: %{message}\n</format>
- <!--format type="cocoon">%5.5{priority} %{time} [%{category}] (%{uri})
%{thread}/%{class:short}: %{message}\n%{throwable}</format-->
+ <format type="cocoon">%5.5{priority} %{time} [%{category}]
(%{uri}%{query}) %{thread}/%{class:short}: %{message}\n</format>
+ <!--format type="cocoon">%5.5{priority} %{time} [%{category}]
(%{uri}%{query}) %{thread}/%{class:short}: %{message}\n%{throwable}</format-->
<!--+
| <append> if set to 'true' will make cocoon append the events
| to the existing file, if set to 'false' cocoon will override
| the existing ones at every new start.
+-->
- <append>false</append>
+ <append>@logappend@</append>
<!--+
| <rotation> allows you to rotate log files one they meet certain
@@ -95,8 +99,8 @@
<cocoon id="deprecation">
<filename>${context-root}/WEB-INF/logs/deprecation.log</filename>
- <format type="cocoon">%5.5{priority} %{time} [%{category}] (%{uri})
%{thread}/%{class:short}: %{message}\n</format>
- <append>true</append>
+ <format type="cocoon">%5.5{priority} %{time} [%{category}]
(%{uri}%{query}) %{thread}/%{class:short}: %{message}\n</format>
+ <append>@logappend@</append>
</cocoon>
<servlet id="servlet">
Modified: cocoon/trunk/tools/targets/init-build.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/init-build.xml?view=diff&r1=161280&r2=161281
==============================================================================
--- cocoon/trunk/tools/targets/init-build.xml (original)
+++ cocoon/trunk/tools/targets/init-build.xml Thu Apr 14 06:43:23 2005
@@ -103,6 +103,7 @@
<filter token="date" value="${TODAY}"/>
<filter token="released.version" value="${released.version}"/>
<filter token="loglevel" value="${build.webapp.loglevel}"/>
+ <filter token="logappend" value="${build.webapp.logappend}"/>
<!-- Alias for the loglevel -->
<property name="loglevel" value="${build.webapp.loglevel}"/>
