cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r240323 - in /cocoon/branches/BRANCH_2_1_X: build.properties src/webapp/WEB-INF/logkit.xconf tools/targets/init-build.xml
Date Fri, 26 Aug 2005 19:49:35 GMT
Author: vgritsenko
Date: Fri Aug 26 12:49:29 2005
New Revision: 240323

URL: http://svn.apache.org/viewcvs?rev=240323&view=rev
Log:
sync with 2.2 - build directory, rootThrowable in log config, logappend parameter.

Modified:
    cocoon/branches/BRANCH_2_1_X/build.properties
    cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/logkit.xconf
    cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml

Modified: cocoon/branches/BRANCH_2_1_X/build.properties
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/build.properties?rev=240323&r1=240322&r2=240323&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/build.properties (original)
+++ cocoon/branches/BRANCH_2_1_X/build.properties Fri Aug 26 12:49:29 2005
@@ -93,7 +93,7 @@
 # ---- Build -------------------------------------------------------------------
 
 build.root=build
-build=${build.root}/${name}-${version}
+build=${build.root}/${name}
 build.dest=${build}/classes
 build.mocks=${build}/mocks
 build.test=${build}/test
@@ -129,6 +129,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/branches/BRANCH_2_1_X/src/webapp/WEB-INF/logkit.xconf
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/logkit.xconf?rev=240323&r1=240322&r2=240323&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/logkit.xconf (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/logkit.xconf Fri Aug 26 12:49:29 2005
@@ -66,19 +66,24 @@
           | <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.
+          |
+          | The first format below is verbose: it includes error stacktraces.
+          | If you want something even more verbose use %{throwable} which will
+          | show a full chain of exceptions. Using the second format won't
+          | output stacktraces at all.
+          |
+          | 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%{rootThrowable}</format>
+      <!--format type="cocoon">%5.5{priority} %{time} [%{category}] (%{uri}%{query})
%{thread}/%{class:short}: %{message}\n%</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 +100,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/branches/BRANCH_2_1_X/tools/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml?rev=240323&r1=240322&r2=240323&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml Fri Aug 26 12:49:29 2005
@@ -105,6 +105,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}"/>
@@ -133,6 +134,7 @@
     </path>
 
   </target>
+
 
   <target name="init-tasks" depends="init">
     <!-- Set classpath for building ant tasks -->



Mime
View raw message