Return-Path: 
 <cvs-return-13708-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 40720 invoked by uid 500); 12 Aug 2003 01:43:19 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
list-post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 40709 invoked by uid 500); 12 Aug 2003 01:43:19 -0000
Delivered-To: apmail-cocoon-2.1-cvs@apache.org
Received: (qmail 40706 invoked from network); 12 Aug 2003 01:43:19 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 12 Aug 2003 01:43:19 -0000
Received: (qmail 71525 invoked by uid 1342); 12 Aug 2003 01:43:35 -0000
Date: 12 Aug 2003 01:43:35 -0000
Message-ID: <20030812014335.71524.qmail@minotaur.apache.org>
From: vgritsenko@apache.org
To: cocoon-2.1-cvs@apache.org
Subject: cvs commit: cocoon-2.1/src/webapp/WEB-INF logkit.xconf
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

vgritsenko    2003/08/11 18:43:35

  Modified:    .        build.properties
               src/targets init-build.xml
               src/webapp/WEB-INF logkit.xconf
  Log:
  Make log level configurable in build.properties
  
  Revision  Changes    Path
  1.25      +1 -0      cocoon-2.1/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/build.properties,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- build.properties	3 Jul 2003 19:50:40 -0000	1.24
  +++ build.properties	12 Aug 2003 01:43:35 -0000	1.25
  @@ -76,6 +76,7 @@
   build.webapp.docs=${build.webapp}/docs
   build.webapp.javadocs=${build.webapp}/api/java
   build.webapp.idldocs=${build.webapp}/api/fom
  +build.webapp.loglevel=INFO
   build.war=${build}/${name}.war
   
   # ------ Standalone-demo Build Properties --------------------------------------
  
  
  
  1.18      +1 -0      cocoon-2.1/src/targets/init-build.xml
  
  Index: init-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/targets/init-build.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- init-build.xml	18 Jul 2003 10:52:50 -0000	1.17
  +++ init-build.xml	12 Aug 2003 01:43:35 -0000	1.18
  @@ -97,6 +97,7 @@
       <filter token="version"             value="${version}"/>
       <filter token="date"                value="${TODAY}"/>
       <filter token="released.version"    value="${released.version}"/>
  +    <filter token="loglevel"            value="${build.webapp.loglevel}"/>
   
       <!-- Set classpath -->
       <path id="classpath">
  
  
  
  1.6       +12 -13    cocoon-2.1/src/webapp/WEB-INF/logkit.xconf
  
  Index: logkit.xconf
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/logkit.xconf,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- logkit.xconf	30 Jul 2003 15:28:46 -0000	1.5
  +++ logkit.xconf	12 Aug 2003 01:43:35 -0000	1.6
  @@ -1,4 +1,5 @@
   <?xml version="1.0"?>
  +
   <logkit>
     <factories>
       <factory type="priority-filter" class="org.apache.avalon.excalibur.logger.factory.PriorityFilterTargetFactory"/>
  @@ -40,7 +41,6 @@
   
       <cocoon id="sitemap">
         <filename>${context-root}/WEB-INF/logs/sitemap.log</filename>
  -
         <format type="cocoon">
           %7.7{priority} %{time}   [%{category}] (%{uri}) %{thread}/%{class:short}: %{message}\n%{throwable}
         </format>
  @@ -89,20 +89,20 @@
         When defining subcategory manually, it is required to specify log
         targets, because they are not inherited in this case.
       -->
  -    <category name="core" log-level="ERROR">
  +    <category name="core" log-level="@loglevel@">
         <!-- Startup component manager logger -->
  -      <category name="startup" log-level="ERROR">
  +      <category name="startup" log-level="@loglevel@">
           <log-target id-ref="core"/>
           <log-target id-ref="error"/>
         </category>
   
  -      <category name="roles" log-level="ERROR">
  +      <category name="roles" log-level="@loglevel@">
           <log-target id-ref="core"/>
           <log-target id-ref="error"/>
         </category>
   
  -      <category name="instrument" log-level="ERROR">
  -        <category name="values" log-level="ERROR">
  +      <category name="instrument" log-level="@loglevel@">
  +        <category name="values" log-level="@loglevel@">
             <log-target id-ref="core"/>
             <log-target id-ref="error"/>
           </category>
  @@ -111,14 +111,14 @@
         </category>
   
         <!-- Cocoon component manager logger -->
  -      <category name="manager" log-level="ERROR">
  +      <category name="manager" log-level="@loglevel@">
           <log-target id-ref="core"/>
           <log-target id-ref="error"/>
         </category>
   
         <!-- Cocoon cache and stores logger -->
  -      <category name="store" log-level="ERROR">
  -        <category name="janitor" log-level="ERROR">
  +      <category name="store" log-level="@loglevel@">
  +        <category name="janitor" log-level="@loglevel@">
             <log-target id-ref="core"/>
             <log-target id-ref="error"/>
           </category>
  @@ -130,20 +130,19 @@
         <log-target id-ref="error"/>
       </category>
   
  -    <category name="sitemap" log-level="ERROR">
  +    <category name="sitemap" log-level="@loglevel@">
         <log-target id-ref="sitemap"/>
         <log-target id-ref="error"/>
       </category>
   
  -    <category name="access" log-level="ERROR">
  +    <category name="access" log-level="@loglevel@">
         <log-target id-ref="access"/>
         <log-target id-ref="error"/>
       </category>
   
  -    <category name="flow" log-level="ERROR">
  +    <category name="flow" log-level="@loglevel@">
         <log-target id-ref="flow"/>
         <log-target id-ref="error"/>
       </category>
  -
     </categories>
   </logkit>