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/17 18:36:09 UTC

svn commit: r125429 - /lenya/branches/BRANCH_1_2_X/build.properties /lenya/branches/BRANCH_1_2_X/src/java/log4j-properties.xsl /lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml

Author: michi
Date: Mon Jan 17 09:36:07 2005
New Revision: 125429

URL: http://svn.apache.org/viewcvs?view=rev&rev=125429
Log:
log4j path configurable
Modified:
   lenya/branches/BRANCH_1_2_X/build.properties
   lenya/branches/BRANCH_1_2_X/src/java/log4j-properties.xsl
   lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml

Modified: lenya/branches/BRANCH_1_2_X/build.properties
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/build.properties?view=diff&rev=125429&p1=lenya/branches/BRANCH_1_2_X/build.properties&r1=125428&p2=lenya/branches/BRANCH_1_2_X/build.properties&r2=125429
==============================================================================
--- lenya/branches/BRANCH_1_2_X/build.properties	(original)
+++ lenya/branches/BRANCH_1_2_X/build.properties	Mon Jan 17 09:36:07 2005
@@ -83,6 +83,7 @@
 # Enable RollingFileAppender of log4j
 
 enable.log4j=false
+log4j.log.file=${tomcat.webapps.dir}/WEB-INF/logs/log4j.log
 
 
 #------------------------------------------------------------------------------------

Modified: lenya/branches/BRANCH_1_2_X/src/java/log4j-properties.xsl
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/log4j-properties.xsl?view=diff&rev=125429&p1=lenya/branches/BRANCH_1_2_X/src/java/log4j-properties.xsl&r1=125428&p2=lenya/branches/BRANCH_1_2_X/src/java/log4j-properties.xsl&r2=125429
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/log4j-properties.xsl	(original)
+++ lenya/branches/BRANCH_1_2_X/src/java/log4j-properties.xsl	Mon Jan 17 09:36:07 2005
@@ -16,7 +16,7 @@
 -->
 
 <!--
-    $Id: log4j-properties.xsl,v 1.16 2004/08/03 16:27:22 andreas Exp $
+    $Id$
     Description: Create log4j.properties file
 -->
 
@@ -27,6 +27,7 @@
 <xsl:output method="text"/>
 
 <xsl:param name="log4j-rollingFileAppender"/>
+<xsl:param name="log4j-rollingFileAppender-File" select="'/no/log4j/file/specified/log4j.log'"/>
 <xsl:param name="webapp-directory"/>
 
 <!-- remove single quotes -->
@@ -46,13 +47,19 @@
 #log4j.appender.A1=org.apache.log4j.ConsoleAppender
 
 log4j.appender.A1=org.apache.log4j.RollingFileAppender
+log4j.appender.A1.File=<xsl:value-of select="$log4j-rollingFileAppender-File"/>
+<!--
 log4j.appender.A1.File=<xsl:value-of select="$directory"/>/WEB-INF/logs/log4j.log
+-->
 </xsl:when>
 <xsl:otherwise>
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
 
 #log4j.appender.A1=org.apache.log4j.RollingFileAppender
+#log4j.appender.A1.File=<xsl:value-of select="$log4j-rollingFileAppender-File"/>
+<!--
 #log4j.appender.A1.File=<xsl:value-of select="$directory"/>/WEB-INF/logs/log4j.log
+-->
 </xsl:otherwise>
 </xsl:choose>
 

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=125429&p1=lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml&r1=125428&p2=lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml&r2=125429
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml	(original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml	Mon Jan 17 09:36:07 2005
@@ -177,6 +177,7 @@
         force="false"
         >
       <param name="log4j-rollingFileAppender" expression="${enable.log4j}"/>
+      <param name="log4j-rollingFileAppender-File" expression="${log4j.log.file}"/>
       <param name="webapp-directory" expression="${tomcat.webapps.dir}"/>
       <outputproperty name="indent" value="yes"/>
     </xslt>

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org


Re: svn commit: r125429 - /lenya/branches/BRANCH_1_2_X/build.properties /lenya/branches/BRANCH_1_2_X/src/java/log4j-properties.xsl /lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml

Posted by "Gregor J. Rothfuss" <gr...@apache.org>.
michi@apache.org wrote:
> Author: michi
> Date: Mon Jan 17 09:36:07 2005
> New Revision: 125429
> 
> URL: http://svn.apache.org/viewcvs?view=rev&rev=125429
> Log:
> log4j path configurable
> Modified:
>    lenya/branches/BRANCH_1_2_X/build.properties
>    lenya/branches/BRANCH_1_2_X/src/java/log4j-properties.xsl
>    lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml

port to trunk please

-- 
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