[tomcat7] 03/03: Search for Oracle JDKs when starting the server

[Emmanuel Bourg]

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

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

commit a7208d9ecddb2ea9ad4fdb394fb82690d1c7556a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 26 11:34:09 2014 +0200

    Search for Oracle JDKs when starting the server
---
 debian/changelog    |  3 ++-
 debian/tomcat7.init | 41 +++++++++++++++++------------------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 967a09f..14055a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ tomcat7 (7.0.54-2) UNRELEASED; urgency=medium
 
   * debian/defaults.template: Bumped the required version of Java mentioned
     in the comment on the JAVA_HOME variable
-  * debian/tomcat7.init: Search for OpenJDK 8 when starting the server
+  * debian/tomcat7.init: Search for OpenJDK 8 and Oracle JDKs when starting
+    the server (Closes: #714349)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 26 May 2014 10:36:43 +0200
 
diff --git a/debian/tomcat7.init b/debian/tomcat7.init
index 3150ead..b2c33f4 100644
--- a/debian/tomcat7.init
+++ b/debian/tomcat7.init
@@ -55,37 +55,30 @@ TOMCAT7_GROUP=tomcat7
 
 # this is a work-around until there is a suitable runtime replacement 
 # for dpkg-architecture for arch:all packages
-# this function sets the variable OPENJDKS
-find_openjdks()
+# this function sets the variable JDK_DIRS
+find_jdks()
 {
-        for jvmdir in /usr/lib/jvm/java-8-openjdk-*
+    for java_version in 9 8 7 6
+    do
+        for jvmdir in /usr/lib/jvm/java-${java_version}-openjdk-* \
+                      /usr/lib/jvm/jdk-${java_version}-oracle-* \
+                      /usr/lib/jvm/jre-${java_version}-oracle-*
         do
-                if [ -d "${jvmdir}" ]
-                then
-                        OPENJDKS=$jvmdir
-                fi
-        done
-        for jvmdir in /usr/lib/jvm/java-7-openjdk-*
-        do
-                if [ -d "${jvmdir}" -a "${jvmdir}" != "/usr/lib/jvm/java-7-openjdk-common" ]
-                then
-                        OPENJDKS="${OPENJDKS} ${jvmdir}"
-                fi
-        done
-        for jvmdir in /usr/lib/jvm/java-6-openjdk-*
-        do
-                if [ -d "${jvmdir}" -a "${jvmdir}" != "/usr/lib/jvm/java-6-openjdk-common" ]
-                then
-                        OPENJDKS="${OPENJDKS} ${jvmdir}"
-                fi
+            if [ -d "${jvmdir}" -a "${jvmdir}" != "/usr/lib/jvm/java-${java_version}-openjdk-common" ]
+            then
+                JDK_DIRS="${JDK_DIRS} ${jvmdir}"
+            fi
         done
+    done
+
+    # Add older non multi arch installations
+    JDK_DIRS="${JDK_DIRS} /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-7-oracle"
 }
 
-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"
+find_jdks
 
 # 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/tomcat7.git