From 6dd1ed08c5a4fa7e10c25df99aa7125d05fdbdee Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 30 Apr 2009 15:33:14 +0000
Subject: [PATCH] Fix for issue 3963 (control panel Java Settings panel error messages not specific)

---
 opendj-sdk/opends/src/messages/messages/admin_tool.properties |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/opendj-sdk/opends/src/messages/messages/admin_tool.properties b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
index 50c9df2..d90eec2 100644
--- a/opendj-sdk/opends/src/messages/messages/admin_tool.properties
+++ b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
@@ -1713,20 +1713,40 @@
  reading the Java settings.  Details: %s
 MILD_ERR_CTRL_PANEL_ERR_READING_JAVA_SETTINGS_SUMMARY=Error reading Java \
  settings
-INFO_CTRL_PANEL_CHECKING_JAVA_ARGUMENTS_SUMMARY=Checking provided Java \
- arguments...
+INFO_CTRL_PANEL_CHECKING_JAVA_OPTIONS_SUMMARY=Checking provided Java \
+ options...
 MILD_ERR_CTRL_PANEL_JAVA_PATH_DOES_NOT_EXIST=Path '%s' does not exist.
 MILD_ERR_CTRL_PANEL_JAVA_PATH_NOT_A_DIRECTORY=Path '%s' is not a directory.  \
  You must specify the path to the Java installation to be used.
 MILD_ERR_CTRL_PANEL_JAVA_BINARY_NOT_FOUND=Could not find binary '%s'.  You \
  must specify the path to the Java installation to be used.
 #
-# Note that the following property contains line breaks in HTML format (<br>)
+# Note that the following five properties contain line breaks in HTML format
+# (<br>)
 #
 INFO_CTRL_PANEL_CONFIRM_NOT_WORKING_ARGUMENTS_DETAILS=The following Java \
  arguments could not be used with binary '%s':<br>%s\
  <br><br>The command-lines associated with those Java arguments may not \
  work.<br>Do you want to continue?
+INFO_CTRL_PANEL_CONFIRM_NOT_WORKING_FALLBACK_ARGUMENTS_DETAILS=The following \
+ Java arguments could not be used with binary '%s':<br>%s\
+ <br><br>These arguments will be used as fall back when OPENDS_JAVA_ARGS is \
+ not defined.  If you do not want to specify a fall back, leave those \
+ arguments empty.<br><br>The command-lines associated with those Java \
+ arguments may not work.<br>Do you want to continue?
+SEVERE_ERR_CTRL_PANEL_GENERIC_ERROR_FALLBACK_JAVAHOME=The Java home value '%s' \
+ is not valid.  This value will be used as fall back when the OPENDS_JAVA_HOME \
+ environment variable is not defined.  If you do not want to specify a fall \
+ back, leave the Java Home text field empty or specify a valid Java home.<br>\
+ Error details:<br>%s
+SEVERE_ERR_CTRL_PANEL_NOT_WORKING_JVM_DETAILS=The Java binary '%s' \
+ could not be used to launch the OpenDS scripts.<br>OpenDS cannot run using \
+ the provided Java Home.
+SEVERE_ERR_CTRL_PANEL_NOT_WORKING_FALLBACK_JVM_DETAILS=The Java binary '%s' \
+ could not be used to launch the OpenDS scripts.  This value will be used as \
+ fall back when the OPENDS_JAVA_HOME environment variable is not defined.  If \
+ you do not want to specify a fall back, leave the Java Home text field empty \
+ or specify a valid Java home.
 MILD_ERR_CTRL_PANEL_ERROR_CHECKING_JAVA_SETTINGS_SUMMARY=Error checking Java \
  settings
 MILD_ERR_CTRL_PANEL_ERROR_CHECKING_JAVA_SETTINGS_DETAILS=An unexpected error \

--
Gitblit v1.10.0