From ff9b49ad76234e3b60512fc479343030a6b367ad Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Wed, 18 Aug 2010 09:47:15 +0000
Subject: [PATCH] Cleanup. Remove references to Java 5 since we no longer support it. Cleanup messages, removing unnecessary casts (due to bugs in early versions of Java 5), removing dead code. The minimal version has been set to Java 1.6.0_10. Also cleanup the Java Stubs for MacOS, removed the StatusPanel (replaced by ControlPanel since 1.2), and update Info.plist to require 1.6 or higher, show 2.3 as version.
---
opends/resource/bin/_script-util.sh | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/resource/bin/_script-util.sh b/opends/resource/bin/_script-util.sh
index 3eff9cd..1dc84b9 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 5 (or later) installation"
+ echo "Please set OPENDS_JAVA_HOME to the root of a Java 6 (or later) installation"
echo "or edit the java.properties file and then run the dsjavaproperties script to"
echo "specify the Java version to be used"
}
@@ -140,7 +140,7 @@
RESULT_CODE=${?}
if test ${RESULT_CODE} -eq 13
then
- # This is a particular error code that means that the Java version is 5
+ # This is a particular error code that means that the Java version is 6
# but not supported. Let InstallDS to display the localized error message
"${OPENDS_JAVA_BIN}" org.opends.server.tools.InstallDS -t
exit 1
@@ -149,11 +149,11 @@
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 5.0 or higher version."
+ echo "You must specify the path to a valid Java 6.0 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 "
- echo "Java 5.0 installation."
+ echo "Java 6.0 installation."
echo "If you want to have specific Java settings for each command line you must"
echo "follow the steps 3 and 4."
echo "3. Edit the properties file specifying the Java binary and the Java arguments"
@@ -167,7 +167,7 @@
RESULT_CODE=${?}
if test ${RESULT_CODE} -eq 13
then
- # This is a particular error code that means that the Java version is 5
+ # This is a particular error code that means that the Java version is 6
# but not supported. Let InstallDS to display the localized error message
"${OPENDS_JAVA_BIN}" org.opends.server.tools.InstallDS -t
exit 1
@@ -177,11 +177,11 @@
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 5.0 or higher version."
+ echo "You must specify the path to a valid Java 6.0 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 "
- echo "Java 5.0 installation."
+ echo "Java 6.0 installation."
echo "If you want to have specific Java settings for each command line you must"
echo "follow the steps 3 and 4."
echo "3. Edit the properties file specifying the Java binary and the Java arguments"
--
Gitblit v1.10.0