Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /tomcat/trunk:r810976

Index: RUNNING.txt
===================================================================
--- RUNNING.txt	(revision 833530)
+++ RUNNING.txt	(working copy)
@@ -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)
 
Index: bin/catalina.bat
===================================================================
--- bin/catalina.bat	(revision 833530)
+++ bin/catalina.bat	(working copy)
@@ -116,7 +116,6 @@
 if "%CLASSPATH%" == "" goto emptyClasspath
 set CLASSPATH=%CLASSPATH%;
 :emptyClasspath
-set CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar
 
 if not "%CATALINA_BASE%" == "" goto gotBase
 set CATALINA_BASE=%CATALINA_HOME%
@@ -126,6 +125,15 @@
 set CATALINA_TMPDIR=%CATALINA_BASE%\temp
 :gotTmpdir
 
+rem Add tomcat-juli.jar and bootstrap.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;%CATALINA_HOME%\bin\bootstrap.jar
+goto juliClasspathDone
+:juliClasspathHome
+set CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar
+:juliClasspathDone
+
 if not "%LOGGING_CONFIG%" == "" goto noJuliConfig
 set LOGGING_CONFIG=-Dnop
 if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig
Index: bin/catalina.sh
===================================================================
--- bin/catalina.sh	(revision 833530)
+++ bin/catalina.sh	(working copy)
@@ -157,12 +157,19 @@
 if [ ! -z "$CLASSPATH" ] ; then
   CLASSPATH="$CLASSPATH":
 fi
-CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar
 
 if [ -z "$CATALINA_BASE" ] ; then
   CATALINA_BASE="$CATALINA_HOME"
 fi
 
+# Add tomcat-juli.jar and bootstrap.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:"$CATALINA_HOME"/bin/bootstrap.jar
+else
+  CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar
+fi
+
 if [ -z "$CATALINA_TMPDIR" ] ; then
   # Define the java.io.tmpdir to use for Catalina
   CATALINA_TMPDIR="$CATALINA_BASE"/temp
Index: bin/service.bat
===================================================================
--- bin/service.bat	(revision 833530)
+++ bin/service.bat	(working copy)
@@ -92,7 +92,7 @@
 set PR_DESCRIPTION=Apache Tomcat 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_BASE%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\bootstrap.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
Index: webapps/docs/changelog.xml
===================================================================
--- webapps/docs/changelog.xml	(revision 833535)
+++ webapps/docs/changelog.xml	(working copy)
@@ -260,6 +260,10 @@
         Add RemoteIpValve, a port of mod_remoteip. Patch provided by Cyrille Le
         Clerc. (markt)
       </add>
+      <update>
+        Allow per instance configuration of JULI or log4j for core Tomcat
+        logging when using CATALINA_BASE. (markt)
+      </update>
     </changelog>
   </subsection>
   <subsection name="Coyote">
Index: webapps/docs/logging.xml
===================================================================
--- webapps/docs/logging.xml	(revision 833530)
+++ webapps/docs/logging.xml	(working copy)
@@ -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>