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/18 23:28:05 UTC
svn commit: r125555 - /lenya/trunk/build.properties /lenya/trunk/src/java/log4j-properties.xsl /lenya/trunk/src/targets/init-build.xml
Author: michi
Date: Tue Jan 18 14:28:04 2005
New Revision: 125555
URL: http://svn.apache.org/viewcvs?view=rev&rev=125555
Log:
log4j path configurable
Modified:
lenya/trunk/build.properties
lenya/trunk/src/java/log4j-properties.xsl
lenya/trunk/src/targets/init-build.xml
Modified: lenya/trunk/build.properties
Url: http://svn.apache.org/viewcvs/lenya/trunk/build.properties?view=diff&rev=125555&p1=lenya/trunk/build.properties&r1=125554&p2=lenya/trunk/build.properties&r2=125555
==============================================================================
--- lenya/trunk/build.properties (original)
+++ lenya/trunk/build.properties Tue Jan 18 14:28:04 2005
@@ -14,16 +14,19 @@
# Properties controlling the build process
+
#------------------------------------------------------------------------------------
# The root of the Cocoon source tree
cocoon.src.dir=../cocoon-2.1.6
+
#------------------------------------------------------------------------------------
# The original, unmodified and expanded cocoon webapp directory
cocoon.webapp.dir=${cocoon.src.dir}/build/webapp
+
#------------------------------------------------------------------------------------
# Root directories where publications are located
@@ -32,6 +35,14 @@
#------------------------------------------------------------------------------------
+# Web Application Server
+
+web.app.server=Jetty
+#web.app.server=Tomcat
+#web.app.server=WLS
+
+
+#------------------------------------------------------------------------------------
# Where the 'install' build target should put the webapp context
# WARNING: This has to be an absolute path! (FIXME: cocoon.xconf needs absolute path (scr/targets/init-build.xml))
# NOTE: Do not use white spaces within the path
@@ -63,6 +74,7 @@
tomcat.endorsed.dir=${tomcat.home.dir}/common/endorsed
+
#------------------------------------------------------------------------------------
# Files and directories which should be excluded during 'install' and 'reset'
# Comma- or space-separated list of patterns
@@ -83,6 +95,7 @@
# Enable RollingFileAppender of log4j
enable.log4j=false
+log4j.log.file=${tomcat.webapps.dir}/WEB-INF/logs/log4j.log
#------------------------------------------------------------------------------------
@@ -96,6 +109,7 @@
ide.eclipse.outputdir=build/eclipse/classes
ide.eclipse.export.libs=false
+
#------------------------------------------------------------------------------------
# Xopus context name
Modified: lenya/trunk/src/java/log4j-properties.xsl
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/log4j-properties.xsl?view=diff&rev=125555&p1=lenya/trunk/src/java/log4j-properties.xsl&r1=125554&p2=lenya/trunk/src/java/log4j-properties.xsl&r2=125555
==============================================================================
--- lenya/trunk/src/java/log4j-properties.xsl (original)
+++ lenya/trunk/src/java/log4j-properties.xsl Tue Jan 18 14:28:04 2005
@@ -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,13 @@
#log4j.appender.A1=org.apache.log4j.ConsoleAppender
log4j.appender.A1=org.apache.log4j.RollingFileAppender
-log4j.appender.A1.File=<xsl:value-of select="$directory"/>/WEB-INF/logs/log4j.log
+log4j.appender.A1.File=<xsl:value-of select="$log4j-rollingFileAppender-File"/>
</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="$directory"/>/WEB-INF/logs/log4j.log
+#log4j.appender.A1.File=<xsl:value-of select="$log4j-rollingFileAppender-File"/>
</xsl:otherwise>
</xsl:choose>
Modified: lenya/trunk/src/targets/init-build.xml
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/init-build.xml?view=diff&rev=125555&p1=lenya/trunk/src/targets/init-build.xml&r1=125554&p2=lenya/trunk/src/targets/init-build.xml&r2=125555
==============================================================================
--- lenya/trunk/src/targets/init-build.xml (original)
+++ lenya/trunk/src/targets/init-build.xml Tue Jan 18 14:28:04 2005
@@ -197,6 +197,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