Author: markt
Date: Thu Sep 3 14:48:03 2009
New Revision: 810976
URL: http://svn.apache.org/viewvc?rev=810976&view=rev
Log:
Allow per instance selection of log4j or JULI logging.
Modified:
tomcat/trunk/RUNNING.txt
tomcat/trunk/bin/catalina.bat
tomcat/trunk/bin/catalina.sh
tomcat/trunk/bin/service.bat
tomcat/trunk/res/bootstrap.jar.manifest
tomcat/trunk/webapps/docs/logging.xml
Modified: tomcat/trunk/RUNNING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/RUNNING.txt?rev=810976&r1=810975&r2=810976&view=diff
==============================================================================
--- tomcat/trunk/RUNNING.txt (original)
+++ tomcat/trunk/RUNNING.txt Thu Sep 3 14:48:03 2009
@@ -104,7 +104,7 @@
files in the following directories based on the value of $CATALINA_BASE instead
of $CATALINA_HOME:
-* bin - Only setenv.sh (*nix) and setenv.bat (windows)
+* bin - Only setenv.sh (*nix), setenv.bat (windows) and tomcat-juli.jar
* conf - Server configuration files (including server.xml)
Modified: tomcat/trunk/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=810976&r1=810975&r2=810976&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Thu Sep 3 14:48:03 2009
@@ -126,6 +126,15 @@
set CATALINA_TMPDIR=%CATALINA_BASE%\temp
:gotTmpdir
+rem Add tomcat-juli.jar to classpath
+rem tomcat-juli.jar can be over-ridden per instance
+if not exist "%CATALINA_BASE%\bin\tomcat-juli.jar" goto juliClasspathHome
+set CLASSPATH=%CLASSPATH%;%CATALINA_BASE%\bin\tomcat-juli.jar
+goto juliClasspathDone
+:juliClasspathHome
+set CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\tomcat-juli.jar
+:juliClasspathDone
+
if not "%LOGGING_CONFIG%" == "" goto noJuliConfig
set LOGGING_CONFIG=-Dnop
if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig
Modified: tomcat/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=810976&r1=810975&r2=810976&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Thu Sep 3 14:48:03 2009
@@ -168,6 +168,14 @@
CATALINA_TMPDIR="$CATALINA_BASE"/temp
fi
+# Add tomcat-juli.jar to classpath
+# tomcat-juli.jar can be over-ridden per instance
+if [ -r "$CATALINA_BASE/bin/tomcat-juli.jar" ] ; then
+ CLASSPATH=$CLASSPATH:$CATALINA_BASE/bin/tomcat-juli.jar
+else
+ CLASSPATH=$CLASSPATH:$CATALINA_HOME/bin/tomcat-juli.jar
+fi
+
# Bugzilla 37848: When no TTY is available, don't output to console
have_tty=0
if [ "`tty`" != "not a tty" ]; then
Modified: tomcat/trunk/bin/service.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/service.bat?rev=810976&r1=810975&r2=810976&view=diff
==============================================================================
--- tomcat/trunk/bin/service.bat (original)
+++ tomcat/trunk/bin/service.bat Thu Sep 3 14:48:03 2009
@@ -112,7 +112,7 @@
set PR_DESCRIPTION=Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/
set PR_INSTALL=%EXECUTABLE%
set PR_LOGPATH=%CATALINA_BASE%\logs
-set PR_CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar
+set
PR_CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar;%CATALINA_BASE%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\tomcat-juli.jar
rem Set the server jvm from JAVA_HOME
set PR_JVM=%JAVA_HOME%\jre\bin\server\jvm.dll
if exist "%PR_JVM%" goto foundJvm
Modified: tomcat/trunk/res/bootstrap.jar.manifest
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bootstrap.jar.manifest?rev=810976&r1=810975&r2=810976&view=diff
==============================================================================
--- tomcat/trunk/res/bootstrap.jar.manifest (original)
+++ tomcat/trunk/res/bootstrap.jar.manifest Thu Sep 3 14:48:03 2009
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Main-Class: org.apache.catalina.startup.Bootstrap
-Class-Path: commons-daemon.jar tomcat-juli.jar tomcat-coyote.jar
+Class-Path: commons-daemon.jar tomcat-coyote.jar
Specification-Title: Catalina
Specification-Version: @VERSION_MAJOR_MINOR@
\ No newline at end of file
Modified: tomcat/trunk/webapps/docs/logging.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/logging.xml?rev=810976&r1=810975&r2=810976&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/logging.xml (original)
+++ tomcat/trunk/webapps/docs/logging.xml Thu Sep 3 14:48:03 2009
@@ -296,7 +296,15 @@
documentation</a> for more options. This page is intended only as a
bootstrapping guide.
</p>
-
+
+ <p>
+ If you have multiple instances of Tomcat, each with a separate
+ <code>$CATALINA_HOME</code> but a shared <code>$CATALINA_BASE</code> then
+ you can configure log4j on a per instance basis by replacing references
to
+ <code>$CATALINA_HOME</code> in the above instructions with
+ <code>$CATALINA_BASE</code>. Note that you may need to create a
+ <code>$CATALINA_BASE/lib</code> directory.
+ </p>
</section>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
