You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2005/01/28 10:32:43 UTC
svn commit: r148865 - /lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml /lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/log4j.xconf
Author: michi
Date: Fri Jan 28 01:32:41 2005
New Revision: 148865
URL: http://svn.apache.org/viewcvs?view=rev&rev=148865
Log:
log4j conf added in order to patch Cocoon's log4j conf
Added:
lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/log4j.xconf
Modified:
lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
Modified: lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml?view=diff&rev=148865&p1=lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml&r1=148864&p2=lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml&r2=148865
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml Fri Jan 28 01:32:41 2005
@@ -85,6 +85,7 @@
<echo>INFO: exclude: sitemap.xmap</echo>
<echo>INFO: exclude: WEB-INF/cocoon.xconf</echo>
<echo>INFO: exclude: WEB-INF/logkit.xconf</echo>
+ <echo>INFO: exclude: WEB-INF/log4j.xconf</echo>
<echo>INFO: exclude: WEB-INF/web.xml</echo>
<echo>INFO: exclude: **/javac.jar</echo>
<echo>INFO: exclude: **/pizza*.jar</echo>
@@ -93,6 +94,7 @@
<exclude name="sitemap.xmap"/>
<exclude name="WEB-INF/cocoon.xconf"/>
<exclude name="WEB-INF/logkit.xconf"/>
+ <exclude name="WEB-INF/log4j.xconf"/>
<exclude name="WEB-INF/web.xml"/>
<exclude name="**/javac.jar"/>
<exclude name="**/pizza*.jar"/>
@@ -120,6 +122,10 @@
>
<outputproperty name="indent" value="yes"/>
</xslt>
+
+ <!-- patch log4j.xconf -->
+ <echo>INFO: patching log4j.xconf</echo>
+ <copy file="${src.webapp.dir}/WEB-INF/log4j.xconf" todir="${build.webapp}/WEB-INF"/>
<!-- patch web.xml -->
<echo>INFO: patching web.xml with XSLT stylesheet</echo>
Added: lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/log4j.xconf
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/log4j.xconf?view=auto&rev=148865
==============================================================================
--- (empty file)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/log4j.xconf Fri Jan 28 01:32:41 2005
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ 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">
+ <param name="File" value="${context-root}/WEB-INF/logs/log4j.log" />
+ <param name="Append" value="false" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-4r %d [%t] %-5p %c.%M():%L %x - %m%n"/>
+ <!-- NOTE: Showing the method might slow down logging. In order to improve performance use the pattern below -->
+ <!--<param name="ConversionPattern" value="%-4r %d [%t] %-5p %c %x - %m%n"/>-->
+ </layout>
+ </appender>
+
+ <root>
+ <!-- NOTE: Available log levels: debug, info, warn, error, fatal, log -->
+ <priority value ="error" />
+ <appender-ref ref="COCOON_DEFAULT" />
+ </root>
+
+<!-- TODO: How can specific the following classes resp. packages be configured?
+
+# Lucene Indexing
+log4j.category.org.apache.lenya.lucene.index.AbstractIndexer=INFO
+log4j.category.org.apache.lenya.lucene.index.IndexInformation=INFO
+log4j.category.org.apache.lenya.lucene.index.IndexIterator=INFO
+
+# Apache JCS cache
+log4j.category.org.apache.jcs = ERROR, A1
+
+-->
+
+</log4j:configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org
Re: svn commit: r148865 - /lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
/lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/log4j.xconf
Posted by Michael Wechner <mi...@wyona.com>.
Gregor J. Rothfuss wrote:
>
> if you don't have time to test and check in changes to both branches,
> don't check them in at all.
so why did you check in your changes then!? They were a regression and
improvement at the same time and a certain regression still exists
because of your checkins. The log entries are still doubled and if I
wouldn't have fixed the log pattern for log4j then it wouldn't be as it
used to be (we never discussed changing the pattern or whatsoever!)
I could argue that you should have done the changes first in 1.4-dev,
tested them thoroughly (such that logfiles are not being doubled and the
old patterns would have remained) and then backport them to 1.2.2-dev
Michi
>
>
>
--
Michael Wechner
Wyona Inc. - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
michael.wechner@wyona.com michi@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r148865 - /lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
/lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/log4j.xconf
Posted by "Gregor J. Rothfuss" <gr...@apache.org>.
Michael Wechner wrote:
>> i would *STRONGLY* suggest people take the time to commit to both
>> branches at the same time. otherwise, things get forgotten.
>>
> agreed, but I do not think it will be forgotton, because improvements
> will be noticed and applied at some point also to the other "branch",
> either by the original committer or by someone else. But I want to
> mention that I am not expecting anyone else to apply the same change to
> 1.4-dev (even if it would be nice though), but I currently just don't
> have arbitrary time left and want to check changes first before I check
> them in and this takes some time.
>
> To summarize: I got your point and hope everyone else as well, but I
> hope you also get mine.
if you don't have time to test and check in changes to both branches,
don't check them in at all. relying on someone maybe catching missing
commits is just not robust enough. it's quite possible to avoid the mess
in http://wiki.apache.org/cocoon/MergingBranches
--
Gregor J. Rothfuss
COO, Wyona Content Management Solutions http://wyona.com
Apache Lenya http://lenya.apache.org
gregor.rothfuss@wyona.com gregor@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r148865 - /lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
/lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/log4j.xconf
Posted by Michael Wechner <mi...@wyona.com>.
Gregor J. Rothfuss wrote:
> michi@apache.org wrote:
>
>> Author: michi
>> Date: Fri Jan 28 01:32:41 2005
>> New Revision: 148865
>>
>> URL: http://svn.apache.org/viewcvs?view=rev&rev=148865
>> Log:
>> log4j conf added in order to patch Cocoon's log4j conf
>> Added:
>> lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/log4j.xconf
>
>
> i would *STRONGLY* suggest people take the time to commit to both
> branches at the same time. otherwise, things get forgotten.
>
agreed, but I do not think it will be forgotton, because improvements
will be noticed and applied at some point also to the other "branch",
either by the original committer or by someone else. But I want to
mention that I am not expecting anyone else to apply the same change to
1.4-dev (even if it would be nice though), but I currently just don't
have arbitrary time left and want to check changes first before I check
them in and this takes some time.
To summarize: I got your point and hope everyone else as well, but I
hope you also get mine.
Thanks
Michi
--
Michael Wechner
Wyona Inc. - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
michael.wechner@wyona.com michi@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r148865 - /lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
/lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/log4j.xconf
Posted by "Gregor J. Rothfuss" <gr...@apache.org>.
michi@apache.org wrote:
> Author: michi
> Date: Fri Jan 28 01:32:41 2005
> New Revision: 148865
>
> URL: http://svn.apache.org/viewcvs?view=rev&rev=148865
> Log:
> log4j conf added in order to patch Cocoon's log4j conf
> Added:
> lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/log4j.xconf
i would *STRONGLY* suggest people take the time to commit to both
branches at the same time. otherwise, things get forgotten.
--
Gregor J. Rothfuss
COO, Wyona Content Management Solutions http://wyona.com
Apache Lenya http://lenya.apache.org
gregor.rothfuss@wyona.com gregor@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org