[tomcat8] 02/05: Switch to Java 7

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit a4b7e94ce513946f23dd005916e860cdfead8cb9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 12 15:36:50 2013 +0200

    Switch to Java 7
---
 debian/control           |    2 +-
 debian/defaults.template |    6 +++---
 debian/setenv.sh         |    2 +-
 debian/tomcat8.init      |   14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 1ad5a60..aeef38f 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Homepage: http://tomcat.apache.org
 Package: tomcat8-common
 Architecture: all
 Depends: libtomcat8-java (>= ${source:Version}), ${misc:Depends},
- default-jre-headless | java6-runtime-headless | java6-runtime | java-6-runtime
+ default-jre-headless | java7-runtime-headless | java7-runtime | java-7-runtime
 Description: Servlet and JSP engine -- common files
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web
diff --git a/debian/defaults.template b/debian/defaults.template
index 2581192..06ecce3 100644
--- a/debian/defaults.template
+++ b/debian/defaults.template
@@ -7,9 +7,9 @@ TOMCAT8_USER=tomcat8
 TOMCAT8_GROUP=tomcat8
 
 # 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
+# JDK version 7. If JAVA_HOME is not set, some common directories for
+# OpenJDK and the Oracle JDK are tried.
+#JAVA_HOME=/usr/lib/jvm/java-7-openjdk
 
 # You may pass JVM startup parameters to Java here. If unset, the default
 # options will be: -Djava.awt.headless=true -Xmx128m -XX:+UseConcMarkSweepGC
diff --git a/debian/setenv.sh b/debian/setenv.sh
index 2b89b4b..ff10b33 100644
--- a/debian/setenv.sh
+++ b/debian/setenv.sh
@@ -5,7 +5,7 @@ CATALINA_HOME=/usr/share/tomcat8
 
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
 # defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
+JDK_DIRS="/usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/jre-7-oracle-x64"
 
 # Look for the right JVM to use
 for jdir in $JDK_DIRS; do
diff --git a/debian/tomcat8.init b/debian/tomcat8.init
index 711d82d..8617479 100644
--- a/debian/tomcat8.init
+++ b/debian/tomcat8.init
@@ -58,18 +58,18 @@ TOMCAT8_GROUP=tomcat8
 # this function sets the variable OPENJDKS
 find_openjdks()
 {
-        for jvmdir in /usr/lib/jvm/java-7-openjdk-*
+        for jvmdir in /usr/lib/jvm/java-8-openjdk-*
         do
-                if [ -d "${jvmdir}" -a "${jvmdir}" != "/usr/lib/jvm/java-7-openjdk-common" ]
+                if [ -d "${jvmdir}" -a "${jvmdir}" != "/usr/lib/jvm/java-8-openjdk-common" ]
                 then
-                        OPENJDKS=$jvmdir
+                        OPENJDKS="${OPENJDKS} ${jvmdir}"
                 fi
         done
-        for jvmdir in /usr/lib/jvm/java-6-openjdk-*
+        for jvmdir in /usr/lib/jvm/java-7-openjdk-*
         do
-                if [ -d "${jvmdir}" -a "${jvmdir}" != "/usr/lib/jvm/java-6-openjdk-common" ]
+                if [ -d "${jvmdir}" -a "${jvmdir}" != "/usr/lib/jvm/java-7-openjdk-common" ]
                 then
-                        OPENJDKS="${OPENJDKS} ${jvmdir}"
+                        OPENJDKS=$jvmdir
                 fi
         done
 }
@@ -78,7 +78,7 @@ OPENJDKS=""
 find_openjdks
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
 # defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/default-java ${OPENJDKS} /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-7-oracle"
+JDK_DIRS="/usr/lib/jvm/default-java ${OPENJDKS} /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-oracle"
 
 # Look for the right JVM to use
 for jdir in $JDK_DIRS; do

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git