[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.21-1-8-g194cad6

[tony mancill]

The following commit has been merged in the master branch:
commit 16105cce1fda8d04efee087431051d7c5af51213
Author: tony mancill <tmancill at debian.org>
Date:   Sat Oct 8 21:35:50 2011 -0700

    set JAVA_HOME in /etc/defaults/tomcat7

diff --git a/debian/changelog b/debian/changelog
index e0b1dd5..b89e69c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ tomcat7 (7.0.22-1) UNRELEASED; urgency=low
 
   [ tony mancill ]
   * Add dependency on JRE to tomcat7-common (Closes: #644340)
+  * JAVA_HOME is now set to /usr/lib/jvm/default_java in 
+    /etc/defaults/tomcat7
 
- -- tony mancill <tmancill at debian.org>  Sat, 08 Oct 2011 21:07:40 -0700
+ -- tony mancill <tmancill at debian.org>  Sat, 08 Oct 2011 21:30:01 -0700
 
 tomcat7 (7.0.21-1) unstable; urgency=low
 
diff --git a/debian/defaults.template b/debian/defaults.template
index 5183c08..85b0007 100644
--- a/debian/defaults.template
+++ b/debian/defaults.template
@@ -9,7 +9,7 @@ TOMCAT7_GROUP=tomcat7
 # The home directory of the Java development kit (JDK). You need at least
 # JDK version 1.5. If JAVA_HOME is not set, some common directories for 
 # OpenJDK, the Sun JDK, and various J2SE 1.5 versions are tried.
-#JAVA_HOME=/usr/lib/jvm/openjdk-6-jdk
+JAVA_HOME=/usr/lib/jvm/default-java
 
 # You may pass JVM startup parameters to Java here. If unset, the default
 # options will be: -Djava.awt.headless=true -Xmx128m -XX:+UseConcMarkSweepGC

-- 
tomcat7: Servlet and JSP engine