summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavid knox <dknox@78-97-42-72.skybeam.com>2011-02-28 16:58:35 -0700
committerdavid knox <dknox@78-97-42-72.skybeam.com>2011-02-28 16:58:35 -0700
commit4aa2b84fe7b9caad8ed72c50539aafe25191b6ed (patch)
tree0b8ed134cbef1cf333741d5d5fbef253e82bf91a
parenteea1f30f107f83f4298743d4fc7502bcdb9170c6 (diff)
downloadtomcat-4aa2b84fe7b9caad8ed72c50539aafe25191b6ed.tar.gz
tomcat-4aa2b84fe7b9caad8ed72c50539aafe25191b6ed.tar.xz
tomcat-4aa2b84fe7b9caad8ed72c50539aafe25191b6ed.zip
resolves rhbz 640134
-rw-r--r--tomcat6-6.0.conf2
-rw-r--r--tomcat6.spec3
2 files changed, 4 insertions, 1 deletions
diff --git a/tomcat6-6.0.conf b/tomcat6-6.0.conf
index 668f81a..f2fe56e 100644
--- a/tomcat6-6.0.conf
+++ b/tomcat6-6.0.conf
@@ -9,7 +9,7 @@
#
# Where your java installation lives
-JAVA_HOME="/usr/lib/jvm/java-1.6.0"
+JAVA_HOME="/usr/lib/jvm/jre"
# Where your tomcat installation lives
CATALINA_BASE="@@@TCHOME@@@"
diff --git a/tomcat6.spec b/tomcat6.spec
index 575bc7e..f90861d 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -566,6 +566,9 @@ fi
%{appdir}/sample
%changelog
+* Mon Feb 28 2011 David Knox <dknox@redhat.com> 0:6.0.32-2
+- Resolves rhbz 640134 - setting JAVA_HOME
+
* Mon Feb 28 2011 David Knox <dknox@redhat.com> 0:6.0.32-1
- Rebase on 6.0.32 with several bug fixes and security fixes
- changed apache-commons to jakarta-commons to fix missing