[tomcat6/f14/master] resolves: rhbz# 669969. Logging directory was hardcoded in conf file to /var/log/tomcat6. We are now

[Dave Knox]

commit efafec286e73c4ca55903b44825a670b4a1bfe61
Author: david knox <dknox at 78-97-42-72.skybeam.com>
Date:   Mon Jan 17 11:24:02 2011 -0700

    resolves: rhbz# 669969. Logging directory was hardcoded in conf file to /var/log/tomcat6. We are now using /logs as the value for TOMCAT_LOG. The prohibits overwrites and uses directory structure known to a running tomcat instance

 tomcat6-6.0.init |   15 ++++++++-------
 tomcat6.spec     |    5 +++++
 2 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/tomcat6-6.0.init b/tomcat6-6.0.init
index 4123f1c..02f9254 100644
--- a/tomcat6-6.0.init
+++ b/tomcat6-6.0.init
@@ -43,17 +43,18 @@ else
     SU="/bin/su -s /bin/sh"
 fi
 
-# Get the tomcat config (use this for environment specific settings)
+# Get instance specific service config file
+if [ -r "/etc/sysconfig/${NAME}" ]; then
+    . /etc/sysconfig/${NAME}
+fi
+
+# Get the tomcat specific config (use this for environment specific settings)
+# Override service specific settings here
 TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
 if [ -r "$TOMCAT_CFG" ]; then
     . $TOMCAT_CFG
 fi
 
-# Get instance specific config file
-if [ -r "/etc/sysconfig/${NAME}" ]; then
-    . /etc/sysconfig/${NAME}
-fi
-
 # Define which connector port to use
 CONNECTOR_PORT="${CONNECTOR_PORT:-8080}"
 
@@ -67,7 +68,7 @@ TOMCAT_PROG="${NAME}"
 TOMCAT_USER="${TOMCAT_USER:-tomcat}"
 
 # Define the tomcat log file
-TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat6/catalina.out}"
+TOMCAT_LOG="${TOMCAT_LOG:-${CATALINA_HOME}/var/logs/catalina.out}"
 
 RETVAL="0"
 
diff --git a/tomcat6.spec b/tomcat6.spec
index b1b661b..74f1ae7 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -630,6 +630,11 @@ fi
 %{appdir}/sample
 
 %changelog
+* Mon Jan 17 2011 David Knox <dknox at redhat.com> 0:6.0.26-17
+- Resolves: rhbz# 669969 - tomcat.conf sets javax.sql.DataSource.Factory=org.apache.commons.dbcp.BasicDataSourceFactory" as the default. 
+- Resolves issues running multiple instances on a single host. Logging
+- directory points to ${CATALINA_HOME}/logs/
+
 * Thu Dec  2 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> 0:6.0.26-16
 - Fix log4j symlink (Resolves rhbz#654660)