From 154fe7cbc66d827c66b1589ca4e5b38a1ef993e4 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Wed, 18 Aug 2010 16:05:51 +0000
Subject: [PATCH] Improve error message for required version of Java runtime

---
 opends/resource/bin/_script-util.sh  |    6 +++---
 opends/resource/bin/_script-util.bat |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opends/resource/bin/_script-util.bat b/opends/resource/bin/_script-util.bat
index e26613e..28f93d3 100644
--- a/opends/resource/bin/_script-util.bat
+++ b/opends/resource/bin/_script-util.bat
@@ -119,7 +119,7 @@
 
 :noJavaFound
 echo ERROR:  Could not find a valid Java binary to be used.
-echo You must specify the path to a valid Java 6.0 or higher version.
+echo You must specify the path to a valid Java 6.0 update 10 or higher version.
 echo The procedure to follow is:
 echo 1. Delete the file %INSTANCE_ROOT%\lib\set-java-home.bat if it exists.
 echo 2. Set the environment variable OPENDS_JAVA_HOME to the root of a valid
@@ -152,7 +152,7 @@
 echo ERROR:  The detected Java version could not be used.  The detected
 echo Java binary is:
 echo %OPENDS_JAVA_BIN%
-echo You must specify the path to a valid Java 6.0 or higher version.
+echo You must specify the path to a valid Java 6.0 update 10 or higher version.
 echo The procedure to follow is:
 echo 1. Delete the file %INSTANCE_ROOT%\lib\set-java-home.bat if it exists.
 echo 2. Set the environment variable OPENDS_JAVA_HOME to the root of a valid
@@ -178,7 +178,7 @@
 echo arguments %OPENDS_JAVA_ARGS%.
 echo The detected Java binary is:
 echo %OPENDS_JAVA_BIN%
-echo You must specify the path to a valid Java 6.0 or higher version.
+echo You must specify the path to a valid Java 6.0 update 10 or higher version.
 echo The procedure to follow is:
 echo 1. Delete the file %INSTANCE_ROOT%\lib\set-java-home.bat if it exists.
 echo 2. Set the environment variable OPENDS_JAVA_HOME to the root of a valid
diff --git a/opends/resource/bin/_script-util.sh b/opends/resource/bin/_script-util.sh
index 1dc84b9..a779536 100644
--- a/opends/resource/bin/_script-util.sh
+++ b/opends/resource/bin/_script-util.sh
@@ -29,7 +29,7 @@
 # Display an error message
 #
 display_java_not_found_error() {
-  echo "Please set OPENDS_JAVA_HOME to the root of a Java 6 (or later) installation"
+  echo "Please set OPENDS_JAVA_HOME to the root of a Java 6 update 10 (or higher) installation"
   echo "or edit the java.properties file and then run the dsjavaproperties script to"
   echo "specify the Java version to be used"
 }
@@ -149,7 +149,7 @@
       echo "ERROR:  The detected Java version could not be used.  The detected"
       echo "Java binary is:"
       echo "${OPENDS_JAVA_BIN}"
-      echo "You must specify the path to a valid Java 6.0 or higher version."
+      echo "You must specify the path to a valid Java 6.0 update 10 or higher version."
       echo "The procedure to follow is:"
       echo "1. Delete the file ${INSTANCE_ROOT}/lib/set-java-home" if it exists.
       echo "2. Set the environment variable OPENDS_JAVA_HOME to the root of a valid "
@@ -177,7 +177,7 @@
       echo "arguments ${OPENDS_JAVA_ARGS}."
       echo "The detected Java binary is:"
       echo "${OPENDS_JAVA_BIN}"
-      echo "You must specify the path to a valid Java 6.0 or higher version."
+      echo "You must specify the path to a valid Java 6.0 update 10 or higher version."
       echo "The procedure to follow is:"
       echo "1. Delete the file ${INSTANCE_ROOT}/lib/set-java-home" if it exists.
       echo "2. Set the environment variable OPENDS_JAVA_HOME to the root of a valid "

--
Gitblit v1.10.0