From 60cef03623cee1534308dc9325860667445c14d0 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 25 Jun 2009 03:57:04 +0000
Subject: [PATCH] Fix for issue 4021 (quicksetup.properties has too many references to OpenDS)
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java | 6 +
opendj-sdk/opends/src/messages/messages/quicksetup.properties | 132 ++++++++++++++++++++++----------------------
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeSvr4Launcher.java | 10 ++-
3 files changed, 77 insertions(+), 71 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/quicksetup.properties b/opendj-sdk/opends/src/messages/messages/quicksetup.properties
index 1f742eb..4e74289 100644
--- a/opendj-sdk/opends/src/messages/messages/quicksetup.properties
+++ b/opendj-sdk/opends/src/messages/messages/quicksetup.properties
@@ -53,8 +53,8 @@
information.%nThe error is: %s
# Only translate if the image is specific to the local
INFO_BACKGROUND_ICON=images/opendsbackground.png
-INFO_BACKGROUND_ICON_DESCRIPTION=OpenDS QuickSetup.
-INFO_BACKGROUND_ICON_TOOLTIP=OpenDS QuickSetup
+INFO_BACKGROUND_ICON_DESCRIPTION=QuickSetup.
+INFO_BACKGROUND_ICON_TOOLTIP=QuickSetup
INFO_BASE_DN_IS_CONFIGURATION_DN=The provided Directory Base DN is used for \
storing the server configuration data. You must specify a different DN.
INFO_BASE_DN_LABEL=Directory Base DN:
@@ -66,7 +66,7 @@
INFO_BUILD_EXTRACTOR_ERROR=Failed to extract build: %s
INFO_BUILD_EXTRACTOR_ERROR_FILE_NO_EXIST=File %s does not exist.
INFO_BUILD_EXTRACTOR_ERROR_FILE_NOT_ZIP=File %s is not a .zip file.
-INFO_BUILD_EXTRACTOR_FILE_INVALID=Could not extract a valid OpenDS \
+INFO_BUILD_EXTRACTOR_FILE_INVALID=Could not extract a valid server \
installation from %s because: %s
INFO_BUILD_MANAGER_DOWNLOADING_BUILD=Downloading Build...
INFO_BUILD_MANAGER_DOWNLOADING_BUILD_DONE=Finished Downloading Build
@@ -178,23 +178,23 @@
INFO_CLOSE_PROGRESS_BUTTON_TOOLTIP=Close Progress Dialog
# Only translate if color is specific to the local
INFO_COMBOBOX_BACKGROUND_COLOR=255,255,255
-INFO_CONFIRM_CANCEL_INSTALL_MSG=Are you sure you want to cancel OpenDS \
+INFO_CONFIRM_CANCEL_INSTALL_MSG=Are you sure you want to cancel \
QuickSetup?%nIf you click 'Yes' nothing will be installed on your system.
INFO_CONFIRM_CANCEL_INSTALL_TITLE=Confirmation Required
INFO_CONFIRM_CANCEL_PROMPT=Cancel the running operation?
INFO_CONFIRM_CANCEL_TITLE=Confirmation Required
-INFO_CONFIRM_CANCEL_UPGRADE_MSG=OpenDS QuickUpgrade has not yet \
+INFO_CONFIRM_CANCEL_UPGRADE_MSG=QuickUpgrade has not yet \
completed.%nIf you click 'Yes' any changes that have been made to the server \
being upgraded will be backed out.%n%nAre you sure you want to close the \
QuickUpgrade Window?%n
INFO_CONFIRM_CANCEL_UPGRADE_TITLE=Confirmation Required
-INFO_CONFIRM_CLOSE_INSTALL_MSG=OpenDS QuickSetup has not yet completed.%nAre \
+INFO_CONFIRM_CLOSE_INSTALL_MSG=QuickSetup has not yet completed.%nAre \
you sure you want to close the QuickSetup Window?
INFO_CONFIRM_CLOSE_INSTALL_TITLE=Confirmation Required
-INFO_CONFIRM_QUIT_INSTALL_MSG=Are you sure you want to quit OpenDS \
+INFO_CONFIRM_QUIT_INSTALL_MSG=Are you sure you want to quit \
QuickSetup?%nIf you click 'Yes' nothing will be installed on your system.
INFO_CONFIRM_QUIT_INSTALL_TITLE=Confirmation Required
-INFO_CONFIRM_QUIT_UPGRADE_MSG=Are you sure you want to quit OpenDS \
+INFO_CONFIRM_QUIT_UPGRADE_MSG=Are you sure you want to quit \
QuickUpgrade?%nIf you click 'Yes' nothing will be upgraded on your system.
INFO_CONFIRM_QUIT_UPGRADE_TITLE=Confirmation Required
INFO_CONFIRMATION_TITLE=Confirmation Required
@@ -214,7 +214,7 @@
# Only translate if the color is specific to the local
INFO_CURRENT_STEP_PANEL_BACKGROUND_COLOR=255,255,255
INFO_DATA_OPTIONS_PANEL_INSTRUCTIONS=Choose options for the LDAP data to be \
- hosted by OpenDS.
+ hosted by the server.
INFO_DATA_OPTIONS_PANEL_TITLE=Directory Data
INFO_DATA_OPTIONS_STEP=Directory Data
INFO_DATA_REPLICATION_OPTIONS_PANEL_INSTRUCTIONS=Choose the Data Replication \
@@ -259,7 +259,7 @@
INFO_EMPTY_REMOTE_HOST=You must provide the fully qualified name of the host.
INFO_EMPTY_REMOTE_PWD=You must provide an Admin User password.
INFO_EMPTY_SERVER_LOCATION=Invalid Directory Selected. You must provide a \
- valid OpenDS root installation directory.
+ valid server root installation directory.
INFO_ENABLE_SSL=Enable SSL on LDAP Port %s
INFO_ENABLE_SSL_LABEL=Enable SSL on Port:
INFO_ENABLE_SSL_TOOLTIP=Enables SSL on the specified port.
@@ -267,9 +267,9 @@
INFO_ENABLE_STARTTLS_LABEL=Enable StartTLS for LDAP
INFO_ENABLE_STARTTLS_TOOLTIP=Allows encrypted communication over the standard \
LDAP port.
-INFO_ENABLE_WINDOWS_SERVICE_LABEL=Run OpenDS as a Windows Service
-INFO_ENABLE_WINDOWS_SERVICE_TOOLTIP=Check this check box if you want OpenDS \
- to run as a Windows Service.
+INFO_ENABLE_WINDOWS_SERVICE_LABEL=Run the server as a Windows Service
+INFO_ENABLE_WINDOWS_SERVICE_TOOLTIP=Check this check box if you want the \
+ server to run as a Windows Service.
INFO_EQUAL_PORTS=You must specify different ports for LDAP and LDAPS \
communication.
INFO_ERROR_ACCESSING_JKS_KEYSTORE=Could not access the JKS key store. Check \
@@ -301,8 +301,8 @@
INFO_ERROR_BACKUP_DB_TOOL_RETURN_CODE=The backup tool returned error code %s.
INFO_ERROR_BACKUP_FILESYSTEM=Error backing up files.
INFO_ERROR_BAD_STAGE_DIRECTORY=Directory %s does not contain a staged \
- installation of OpenDS as was expected. Verify that the new installation \
- package (.zip) is an OpenDS installation file and that you have write access \
+ installation of the server as was expected. Verify that the new installation \
+ package (.zip) is a server installation file and that you have write access \
permission for this directory.
INFO_ERROR_BROWSER_CLOSE_BUTTON_TOOLTIP=Close this window
INFO_ERROR_BROWSER_COPY_BUTTON_LABEL=Copy URL
@@ -322,9 +322,9 @@
INFO_ERROR_COULD_NOT_CREATE_PARENT_DIR=Could not create parent directory %s. \
Check that you have file system access rights.
INFO_ERROR_CREATING_BASE_ENTRY=Error Creating Base Entry.
-INFO_ERROR_CREATING_BUILD_INFO=Error determining OpenDS build information.
-INFO_ERROR_CREATING_BUILD_INFO_MSG=Error determining OpenDS build information. \
- Details: %s
+INFO_ERROR_CREATING_BUILD_INFO=Error determining the server build information.
+INFO_ERROR_CREATING_BUILD_INFO_MSG=Error determining the server build \
+ information. Details: %s
INFO_ERROR_CREATING_TEMP_FILE=An error occurred creating the temporary file.
INFO_ERROR_DELETING_DIRECTORY=Error deleting directory %s. Check that you \
have the rights to delete this directory and that there is no other \
@@ -376,13 +376,13 @@
INFO_ERROR_INSTALL_ROOT_DIR_NO_DIR=Directory %s does not contain directory \
%s.
INFO_ERROR_INSTALL_ROOT_DIR_NO_EXIST=Directory %s does not exist.
-INFO_ERROR_INSTALL_ROOT_DIR_NOT_DIR=File %s is not an OpenDS installation \
+INFO_ERROR_INSTALL_ROOT_DIR_NOT_DIR=File %s is not a server installation \
root.
INFO_ERROR_INSTALL_ROOT_DIR_NULL=The root directory is null.
INFO_ERROR_INVALID_PORT_VALUE=Invalid port value %s. A port number must be \
an integer between 1 and 65535.
INFO_ERROR_INVALID_SERVER_LOCATION=Invalid Directory Selected: %s%nEither the \
- selected directory is not a valid OpenDS root installation%ndirectory or you \
+ selected directory is not a valid server root installation%ndirectory or you \
do not have access permissions for this directory.
# Only translate if the image is specific to the local
INFO_ERROR_LARGE_ICON=images/error_large.gif
@@ -505,7 +505,7 @@
INFO_GENERAL_UNSUPPORTED=Unsupported
INFO_GENERAL_WARNING=Warning
INFO_GLOBAL_ADMINISTRATOR_DESCRIPTION=The Administrator that can manage all \
- the OpenDS instances.
+ the server instances.
INFO_GLOBAL_ADMINISTRATOR_PANEL_INSTRUCTIONS=Provide the informaton to create \
a Global Administrator that will able to manage your whole replication \
topology.
@@ -576,18 +576,18 @@
of these database files will be deleted.
INFO_INSTALLSTATUS_CONFIGFILEMODIFIED=Has already been configured
INFO_INSTALLSTATUS_DBFILEEXIST=Contains data
-INFO_INSTALLSTATUS_INSTALLED=OpenDS Server Already Configured<br> QuickSetup \
- can only be used with OpenDS Servers that have not yet been configured. The \
+INFO_INSTALLSTATUS_INSTALLED=Server Already Configured<br> QuickSetup \
+ can only be used with servers that have not yet been configured. The \
current server:%s
-INFO_INSTALLSTATUS_INSTALLED_CLI=OpenDS Server Already Configured%n %s \
- command-line can only be used with OpenDS Servers that have not yet been \
+INFO_INSTALLSTATUS_INSTALLED_CLI=Server Already Configured%n %s \
+ command-line can only be used with servers that have not yet been \
configured. The current server:%s
INFO_INSTALLSTATUS_NOT_INSTALLED=The Directory Server is not installed.
INFO_INSTALLSTATUS_SERVERRUNNING=Is currently running on port %s
# Only translate if the color is specific to the local
INFO_INSTRUCTIONS_COLOR=000,000,000
INFO_INVALID_CHAR_IN_PATH=The path contains the character "%s" which is not \
- allowed to install OpenDS.
+ allowed to install the server.
INFO_INVALID_NUMBER_ENTRIES_RANGE=The number of user entries to generate \
automatically must be an integer between %s and %s.
INFO_INVALID_PORT_VALUE_RANGE=The LDAP Listener Port must be an integer \
@@ -628,8 +628,8 @@
Base DN
# Only translate if the image is specific to the local
INFO_MINIMIZED_ICON=images/opendsminimized.gif
-INFO_MINIMIZED_ICON_DESCRIPTION=OpenDS QuickSetup minimized.
-INFO_MINIMIZED_ICON_TOOLTIP=OpenDS QuickSetup
+INFO_MINIMIZED_ICON_DESCRIPTION=QuickSetup minimized.
+INFO_MINIMIZED_ICON_TOOLTIP=QuickSetup
# Only translate if the image is specific to the local
INFO_MINIMIZED_MAC_ICON=images/opendsminimizedmac.png
INFO_NETWORK_ERROR_TITLE=Network Error
@@ -649,7 +649,7 @@
Root User DN.
INFO_NOT_AVAILABLE_LABEL=<not available>
INFO_NOT_ENOUGH_DISK_SPACE=There is not enough free disk space under %s.%nAt \
- least %s megabytes of free disk space are required to install OpenDS.
+ least %s megabytes of free disk space are required to install the server.
INFO_NOT_EQUAL_PWD=The passwords you have provided do not match.
INFO_NOT_GLOBAL_ADMINISTRATOR_PROVIDED=You must provide the Global \
Administrator ID to be able to access the configuration of all the remote \
@@ -660,7 +660,7 @@
INFO_OPEN_GENERIC_FILE_DIALOG_TITLE=Choose a File
INFO_OPEN_LDIF_FILE_DIALOG_TITLE=Choose an LDIF File
INFO_OPEN_SERVER_LOCATION_DIALOG_TITLE=Choose Installation Path
-INFO_OPEN_ZIP_FILE_DIALOG_TITLE=Choose an OpenDS Installation Package (.zip)
+INFO_OPEN_ZIP_FILE_DIALOG_TITLE=Choose a Server Installation Package (.zip)
# Only translate if the color is specific to the local
INFO_OPTIONPANE_BACKGROUND_COLOR=255,255,255
INFO_ORACLE_ACTION_PROMPT=Have you performed the tasks described?
@@ -802,15 +802,15 @@
INFO_REMOTE_REPLICATION_PORTS_STEP=Replication Port
INFO_REMOTE_SERVER_DN_LABEL=Admin User:
INFO_REMOTE_SERVER_DN_TOOLTIP=The DN or the UID of an administrator in the \
- OpenDS you want to replicate data with.
+ server you want to replicate data with.
INFO_REMOTE_SERVER_HOST_LABEL=Host Name:
INFO_REMOTE_SERVER_HOST_TOOLTIP=The fully qualified name of the host where \
- the OpenDS you want to replicate data with is located.
+ the server you want to replicate data with is located.
INFO_REMOTE_SERVER_PORT_LABEL=Administration Connector Port:
INFO_REMOTE_SERVER_PORT_TOOLTIP=The administration connector port of the \
- OpenDS you want to replicate data with.
+ server you want to replicate data with.
INFO_REMOTE_SERVER_PWD_LABEL=Admin Password:
-INFO_REMOTE_SERVER_PWD_TOOLTIP=The password of an administrator in the OpenDS \
+INFO_REMOTE_SERVER_PWD_TOOLTIP=The password of an administrator in the server \
you want to replicate data with.
INFO_REMOTE_SERVER_REPLICATION_PORT=%s - To be configured on remote server %s
INFO_REPLICATED_SERVER_LABEL=This server will be part of a replication \
@@ -884,13 +884,13 @@
INFO_SELF_SIGNED_CERTIFICATE=Create a new Self-Signed Certificate
INFO_SERVER_DIRECTORY_MANAGER_DN_LABEL=Root User DN:
INFO_SERVER_DIRECTORY_MANAGER_DN_TOOLTIP=Enter the distinguished name (DN) of \
- the inital Root User account that will used for managing OpenDS
+ the inital Root User account that will used for managing the server
INFO_SERVER_DIRECTORY_MANAGER_PWD_CONFIRM_LABEL=Password (confirm):
INFO_SERVER_DIRECTORY_MANAGER_PWD_CONFIRM_TOOLTIP=Re-enter the password for \
- the OpenDS inital Root User account
+ the server initial Root User account
INFO_SERVER_DIRECTORY_MANAGER_PWD_LABEL=Password:
-INFO_SERVER_DIRECTORY_MANAGER_PWD_TOOLTIP=Enter a password for the OpenDS \
- inital Root User account
+INFO_SERVER_DIRECTORY_MANAGER_PWD_TOOLTIP=Enter a password for the server \
+ initial Root User account
INFO_SERVER_ERROR=Error on %s:
INFO_SERVER_LOCATION_LABEL=Installation Path:
INFO_SERVER_LOCATION_PARENT_TOOLTIP=Enter the full path to the parent \
@@ -911,11 +911,11 @@
Access.
INFO_SERVER_SECURITY_LABEL=LDAP Secure Access:
INFO_SERVER_SECURITY_TOOLTIP=The LDAP Secure Access Configuration for the new \
- OpenDS server.
+ server.
INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS=Enter a port to listen for LDAP \
- requests and enter a password for the OpenDS initial Root user.
+ requests and enter a password for the server initial Root user.
INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS_WEBSTART=Choose a location for the \
- server files and enter a password for the OpenDS administrative user.
+ server files and enter a password for the server administrative user.
INFO_SERVER_SETTINGS_PANEL_TITLE=Server Settings
INFO_SERVER_SETTINGS_STEP=Server Settings
INFO_SETUP_LAUNCHER_GUI_LAUNCHED_FAILED=%n%nThe graphical Setup launch \
@@ -938,16 +938,16 @@
INFO_SHUTDOWN_DIRECTORY_MANAGER_DIALOG_TITLE=Authentication Required
INFO_SHUTDOWN_DIRECTORY_MANAGER_DN_LABEL=Administrative User DN:
INFO_SHUTDOWN_DIRECTORY_MANAGER_DN_TOOLTIP=Enter the distinguished name (DN) \
- of the Administrative User account that will used to shutdown OpenDS
+ of the Administrative User account that will used to shutdown the server
INFO_SHUTDOWN_DIRECTORY_MANAGER_PWD_LABEL=Password:
-INFO_SHUTDOWN_DIRECTORY_MANAGER_PWD_TOOLTIP=Enter the password of the OpenDS \
+INFO_SHUTDOWN_DIRECTORY_MANAGER_PWD_TOOLTIP=Enter the password of the server \
Administrative User account
INFO_SHUTDOWN_DIRECTORY_MANAGER_SHUTDOWN_BUTTON_TOOLTIP=Click here to \
shutdown the server with the provided authentication
# Only translate if the image is specific to the local
INFO_SPLASH_ICON=images/opendssplash.png
-INFO_SPLASH_ICON_DESCRIPTION=OpenDS QuickSetup Launching.
-INFO_SPLASH_ICON_TOOLTIP=OpenDS QuickSetup Launching
+INFO_SPLASH_ICON_DESCRIPTION=QuickSetup Launching.
+INFO_SPLASH_ICON_TOOLTIP=QuickSetup Launching
INFO_SSL_ACCESS_LABEL=SSL Access:
INFO_SSL_PORT_TEXTFIELD_TOOLTIP=The LDAPS port.
INFO_STANDALONE_SERVER_LABEL=This will be a standalone server
@@ -990,7 +990,7 @@
INFO_SUMMARY_IMPORTING_LDIF=Importing LDIF File...
INFO_SUMMARY_INITIALIZE_REPLICATED_SUFFIXES=Initializing Contents of \
Replicated Base DNs...
-INFO_SUMMARY_INSTALL_FINISHED_CANCELED=<b>OpenDS QuickSetup Canceled.</b> \
+INFO_SUMMARY_INSTALL_FINISHED_CANCELED=<b>QuickSetup Canceled.</b> \
<br>The setup was canceled and any files installed to your system \
during this operation have been removed.
INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY=<b>OpenDS QuickSetup Completed \
@@ -1013,17 +1013,17 @@
INFO_SUMMARY_REVERT_CLEANUP=Cleaning Up...
INFO_PROGRESS_REVERT_ABORT=Canceling Reversion
INFO_PROGRESS_REVERT_CLEANUP=Cleaning Up
-INFO_SUMMARY_REVERT_FINISHED_CANCELED_CLI=OpenDS Reversion Canceled. The \
+INFO_SUMMARY_REVERT_FINISHED_CANCELED_CLI=Reversion Canceled. The \
upgrade operation was canceled and the installation has been restored to the \
state it was in before the reversion operation.
-INFO_SUMMARY_REVERT_FINISHED_SUCCESSFULLY_CLI=OpenDS Reversion Completed \
- Successfully. The OpenDS installation at %s has now been reverted to version \
+INFO_SUMMARY_REVERT_FINISHED_SUCCESSFULLY_CLI=Reversion Completed \
+ Successfully. The server installation at %s has now been reverted to version \
%s.
-INFO_SUMMARY_REVERT_FINISHED_WITH_ERRORS_CLI=OpenDS Reversion Failed. The \
+INFO_SUMMARY_REVERT_FINISHED_WITH_ERRORS_CLI=Reversion Failed. The \
reversion operation could not complete successfully due to errors and the \
installation has been restored to the state it was in before the reversion \
operation. See the logs for details on why the reversion operation failed.
-INFO_SUMMARY_REVERT_FINISHED_WITH_WARNINGS_CLI=OpenDS Reversion Succeeded \
+INFO_SUMMARY_REVERT_FINISHED_WITH_WARNINGS_CLI=Reversion Succeeded \
With Warnings. The reversion operation completed successfully but the \
reverter had problems that require attention. See the logs for details on the \
problems.
@@ -1038,11 +1038,11 @@
INFO_PROGRESS_REVERT_VERIFYING=Verifying revert
INFO_SUMMARY_START_ERROR=An error occurred Starting Server. Check 'Details' \
text area for more information.
-INFO_SUMMARY_START_SUCCESS=OpenDS Started Successfully.
+INFO_SUMMARY_START_SUCCESS=Server Started Successfully.
INFO_SUMMARY_STARTING=Starting Server...
INFO_SUMMARY_STOP_ERROR=An error occurred Stopping Server. Check 'Details' \
text area for more information.
-INFO_SUMMARY_STOP_SUCCESS=OpenDS Stopped Successfully.
+INFO_SUMMARY_STOP_SUCCESS=Server Stopped Successfully.
INFO_SUMMARY_STOPPING=Stopping Server...
INFO_SUMMARY_UPGRADE_ABORT=Canceling Upgrade...
INFO_SUMMARY_UPGRADE_APPLYING_CONFIG_CUSTOMIZATION=Applying Configuration \
@@ -1060,35 +1060,35 @@
INFO_SUMMARY_UPGRADE_CLEANUP=Cleaning Up...
INFO_SUMMARY_UPGRADE_DOWNLOADING=Downloading Build...
INFO_SUMMARY_UPGRADE_EXTRACTING=Extracting Build...
-INFO_SUMMARY_UPGRADE_FINISHED_CANCELED=<b>OpenDS QuickUpgrade Canceled.</b> \
+INFO_SUMMARY_UPGRADE_FINISHED_CANCELED=<b>QuickUpgrade Canceled.</b> \
<br>The upgrade operation was canceled and the installation has been restored \
to the state it was in before the upgrade operation.<br><br><INPUT \
type="submit" value="Launch Control Panel"></INPUT>
-INFO_SUMMARY_UPGRADE_FINISHED_CANCELED_CLI=OpenDS QuickUpgrade Canceled. The \
+INFO_SUMMARY_UPGRADE_FINISHED_CANCELED_CLI=QuickUpgrade Canceled. The \
upgrade operation was canceled and the installation has been restored to the \
state it was in before the upgrade operation.
-INFO_SUMMARY_UPGRADE_FINISHED_SUCCESSFULLY=<b>OpenDS QuickUpgrade Completed \
- Successfully.</b><br>The OpenDS installation at %s has now been upgraded to \
+INFO_SUMMARY_UPGRADE_FINISHED_SUCCESSFULLY=<b>QuickUpgrade Completed \
+ Successfully.</b><br>The server installation at %s has now been upgraded to \
version %s.<br><br><INPUT type="submit" value="Launch Control Panel"></INPUT>
-INFO_SUMMARY_UPGRADE_FINISHED_SUCCESSFULLY_CLI=OpenDS QuickUpgrade Completed \
+INFO_SUMMARY_UPGRADE_FINISHED_SUCCESSFULLY_CLI=QuickUpgrade Completed \
Successfully. The OpenDS installation at %s has now been upgraded to version \
%s.
-INFO_SUMMARY_UPGRADE_FINISHED_WITH_ERRORS=<b>OpenDS QuickUpgrade \
+INFO_SUMMARY_UPGRADE_FINISHED_WITH_ERRORS=<b>QuickUpgrade \
Failed</b><br>The upgrade operation could not complete successfully due to \
errors and the installation has been restored to the state it was in before \
the upgrade operation. See the 'Details' text for more information on why \
the upgrade operation failed.<br><br><INPUT type="submit" value="Launch \
Control Panel"></INPUT>
-INFO_SUMMARY_UPGRADE_FINISHED_WITH_ERRORS_CLI=OpenDS QuickUpgrade Failed. The \
+INFO_SUMMARY_UPGRADE_FINISHED_WITH_ERRORS_CLI=QuickUpgrade Failed. The \
upgrade operation could not complete successfully due to errors and the \
installation has been restored to the state it was in before the upgrade \
operation. See the logs for details on why the upgrade operation failed.
-INFO_SUMMARY_UPGRADE_FINISHED_WITH_WARNINGS=<b>OpenDS QuickUpgrade Succeeded \
+INFO_SUMMARY_UPGRADE_FINISHED_WITH_WARNINGS=<b>QuickUpgrade Succeeded \
With Warnings</b><br>The upgrade operation completed successfully but the \
upgrader had problems that require attention. See the 'Details' text for more \
information on the problems.<br><br><INPUT type="submit" value="Launch Control \
Panel"></INPUT>
-INFO_SUMMARY_UPGRADE_FINISHED_WITH_WARNINGS_CLI=OpenDS QuickUpgrade Succeeded \
+INFO_SUMMARY_UPGRADE_FINISHED_WITH_WARNINGS_CLI=QuickUpgrade Succeeded \
With Warnings. The upgrade operation completed successfully but the upgrader \
had problems that require attention. See the logs for details on the \
problems.
@@ -1173,7 +1173,7 @@
INFO_UPGRADE_OPERATION_UPGRADE=Upgrade to a newer version
INFO_UPGRADE_OPERATION_REVERSION_RESPONSE=Please rerun this command specifying \
options that indicate a reversion operation. See the usage guide for details.
-INFO_UPGRADE_FILE_PROMPT=Enter the name and path of the OpenDS install file \
+INFO_UPGRADE_FILE_PROMPT=Enter the name and path of the server install file \
(.zip):
INFO_UPGRADE_LAUNCHER_DESCRIPTION=This utility can be used to upgrade the \
Directory Server to a newer version.
@@ -1186,7 +1186,7 @@
INFO_UPGRADE_LAUNCHER_LAUNCHING_GUI=Launching graphical upgrade...
INFO_UPGRADE_LAUNCHER_USAGE_DESCRIPTION=This utility can be used to upgrade \
the Directory Server to a newer version or revert to a previous version.%n%n\
- When using this tool to upgrade OpenDS you should first downloaded an OpenDS \
+ When using this tool to upgrade the server you should first downloaded an OpenDS \
install package (.zip) file and specify its location using the -f/--file \
option. You can also upgrade your server using the Java \
Web Start version of this tool by visiting the OpenDS web site at \
@@ -1332,7 +1332,7 @@
INFO_LICENSE_CLI_ACCEPT_NO=No
INFO_LICENSE_CLI_ACCEPT_INVALID_RESPONSE=Invalid response
INFO_CONFIRM_UNINSTALL_STEP=Uninstall Options
-INFO_ZIP_FILES_DESCRIPTION=OpenDS Installation Package (.zip)
+INFO_ZIP_FILES_DESCRIPTION=Server Installation Package (.zip)
SEVERE_ERR_COULD_NOT_FIND_REPLICATIONID=Could not find a remote peer to \
initialize the contents of local base DN: %s.
INFO_NEW_UPGRADE_SCRIPT_AVAILABLE=A new version of '%s' has been made \
@@ -1345,7 +1345,7 @@
OPENDS_JAVA_HOME to the root of a compatible Java installation or edit the \
java.properties file and then run the dsjavaproperties script to specify the \
java version to be used.
-SEVERE_ERR_INVALID_JAVA_ARGS=The java arguments used in the OpenDS \
+SEVERE_ERR_INVALID_JAVA_ARGS=The java arguments used in the server \
installation in '%s' do not seem to be compatible with the JVM used to run \
the upgrader (%s).%n%nTo fix this problem delete the file %s and click on \
'Next' again.%nOnce the upgrader finishes you will have to set again the \
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
index c6c81ae..bbd52c2 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
@@ -311,8 +311,10 @@
System.setProperty(ServerConstants.PROPERTY_SCRIPT_NAME, scriptName);
}
- argParser = new ArgumentParser(getClass().getName(),
- INFO_UPGRADE_LAUNCHER_USAGE_DESCRIPTION.get(), false);
+ Message msg = Utils.getCustomizedObject(
+ "INFO_UPGRADE_LAUNCHER_USAGE_DESCRIPTION",
+ INFO_UPGRADE_LAUNCHER_USAGE_DESCRIPTION.get(), Message.class);
+ argParser = new ArgumentParser(getClass().getName(), msg, false);
try
{
file = new StringArgument(
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeSvr4Launcher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeSvr4Launcher.java
index 2eb2c5b..ca902a4 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeSvr4Launcher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeSvr4Launcher.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2007-2008 Sun Microsystems, Inc.
+ * Copyright 2007-2009 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.upgrader;
@@ -32,6 +32,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;
+import org.opends.messages.Message;
import org.opends.quicksetup.CliApplication;
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.QuickSetupLog;
@@ -120,8 +121,11 @@
System.setProperty(ServerConstants.PROPERTY_SCRIPT_NAME, scriptName);
}
- argParser = new ArgumentParser(getClass().getName(),
- INFO_UPGRADE_LAUNCHER_USAGE_DESCRIPTION.get(), false);
+ Message msg = Utils.getCustomizedObject(
+ "INFO_UPGRADE_LAUNCHER_USAGE_DESCRIPTION",
+ INFO_UPGRADE_LAUNCHER_USAGE_DESCRIPTION.get(), Message.class);
+
+ argParser = new ArgumentParser(getClass().getName(), msg, false);
try
{
revertMostRecent = new BooleanArgument(
--
Gitblit v1.10.0