[tomcat7] 02/03: Search for OpenJDK 8 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 35f35f355f81177950f4dc3c3f75fe1c7e3b98be
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 26 11:12:05 2014 +0200

    Search for OpenJDK 8 when starting the server
---
 debian/changelog    | 1 +
 debian/tomcat7.init | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index df86f89..967a09f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ 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
 
  -- 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 967ba23..3150ead 100644
--- a/debian/tomcat7.init
+++ b/debian/tomcat7.init
@@ -58,11 +58,18 @@ TOMCAT7_GROUP=tomcat7
 # this function sets the variable OPENJDKS
 find_openjdks()
 {
+        for jvmdir in /usr/lib/jvm/java-8-openjdk-*
+        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=$jvmdir
+                        OPENJDKS="${OPENJDKS} ${jvmdir}"
                 fi
         done
         for jvmdir in /usr/lib/jvm/java-6-openjdk-*

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