[jetty9] 99/135: Updated the error message displayed when JAVA_HOME in /etc/default/jetty8 doesn't point to a JRE

[Emmanuel Bourg]

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

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

commit 64d9f68da059c1b86c95a45cfe87c2fdc88d6fd4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 2 10:06:44 2015 +0100

    Updated the error message displayed when JAVA_HOME in /etc/default/jetty8 doesn't point to a JRE
---
 debian/changelog   | 7 +++++++
 debian/jetty8.init | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index acfc964..ff35961 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jetty8 (8.1.18-3) UNRELEASED; urgency=medium
+
+  * Updated the error message displayed when the JAVA_HOME variable defined
+    in /etc/default/jetty8 doesn't point to a JRE.
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 02 Dec 2015 10:05:19 +0100
+
 jetty8 (8.1.18-2) unstable; urgency=medium
 
   * Changed the default value of NO_START to 0 in /etc/default/jetty8
diff --git a/debian/jetty8.init b/debian/jetty8.init
index f63d073..1d758b6 100644
--- a/debian/jetty8.init
+++ b/debian/jetty8.init
@@ -213,8 +213,8 @@ JAVA_OPTIONS="$JAVA_OPTIONS -cp $START_CLASSPATH"
 # Check for JAVA_HOME
 ##################################################
 if [ -z "$JAVA_HOME" ]; then
-	log_failure_msg "Could not start $DESC because no Java Development Kit"
-	log_failure_msg "(JDK) was found. Please download and install JDK 1.4 or higher and set"
+	log_failure_msg "Could not start $DESC because no Java Runtime Environment (JRE)"
+	log_failure_msg "was found. Please download and install Java 6 or higher and set"
 	log_failure_msg "JAVA_HOME in /etc/default/jetty8 to the JDK's installation directory."
 	exit 0
 fi

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