From 3dfb061cbafd3a97c9359f739942924a8ee525f1 Mon Sep 17 00:00:00 2001 From: Ludovic Poitou <ludovic.poitou@forgerock.com> Date: Wed, 02 Nov 2011 12:07:15 +0000 Subject: [PATCH] Fix for OPENDJ-222 : Renamed environment variables to OPENDJ_... Updated scripts so that if OPENDJ_JAVA_HOME and OPENDJ_JAVA_ARGS are not defined, we look at the legacy OPENDS_... ones. --- opends/src/messages/messages/admin_tool.properties | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/opends/src/messages/messages/admin_tool.properties b/opends/src/messages/messages/admin_tool.properties index 86a7b77..c25dc7c 100644 --- a/opends/src/messages/messages/admin_tool.properties +++ b/opends/src/messages/messages/admin_tool.properties @@ -1914,21 +1914,21 @@ INFO_CTRL_PANEL_JAVA_PROPERTIES_TITLE=Java Settings INFO_CTRL_PANEL_JAVA_HOME_LABEL=Java Home: INFO_CTRL_PANEL_USE_OPENDS_JAVA_HOME=Use the value of the environment variable \ - OPENDS_JAVA_HOME -INFO_CTRL_PANEL_USE_OPENDS_JAVA_HOME_HELP=If OPENDS_JAVA_HOME is not defined \ + OPENDJ_JAVA_HOME +INFO_CTRL_PANEL_USE_OPENDS_JAVA_HOME_HELP=If OPENDJ_JAVA_HOME is not defined \ the value below will be used as fallback. INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_HOME=Use the following value: INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_HOME_HELP=If the value is not found \ - launching the command-line the value of OPENDS_JAVA_HOME will be used as \ + launching the command-line the value of OPENDJ_JAVA_HOME will be used as \ fallback. INFO_CTRL_PANEL_JAVA_ARGUMENTS_LABEL=Java Arguments: INFO_CTRL_PANEL_USE_OPENDS_JAVA_ARGS=Use the value of the environment variable \ - OPENDS_JAVA_ARGS -INFO_CTRL_PANEL_USE_OPENDS_JAVA_ARGS_HELP=If OPENDS_JAVA_ARGS is not defined \ + OPENDJ_JAVA_ARGS +INFO_CTRL_PANEL_USE_OPENDS_JAVA_ARGS_HELP=If OPENDJ_JAVA_ARGS is not defined \ the values specified below will be used as fallback. INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_ARGS=Use the values specified below INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_ARGS_HELP=If the value is not \ - specified for a command-line the value of OPENDS_JAVA_ARGS will be used as \ + specified for a command-line the value of OPENDJ_JAVA_ARGS will be used as \ fallback. # # Note that the following property must begin with <html> @@ -1961,12 +1961,12 @@ 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 \ + <br><br>These arguments will be used as fall back when OPENDJ_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 \ + is not valid. This value will be used as fall back when the OPENDJ_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 @@ -1975,7 +1975,7 @@ the provided Java Home. SEVERE_ERR_CTRL_PANEL_NOT_WORKING_FALLBACK_JVM_DETAILS=The Java binary '%s' \ could not be used to launch the server scripts. This value will be used as \ - fall back when the OPENDS_JAVA_HOME environment variable is not defined. If \ + fall back when the OPENDJ_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 \ -- Gitblit v1.10.0