From 06dc34882e70da6158464bfb18dd30ef86e1bc1d Mon Sep 17 00:00:00 2001 From: Violette Roche-Montane <violette.roche-montane@forgerock.com> Date: Mon, 03 Jun 2013 07:42:27 +0000 Subject: [PATCH] CR-1777-OPENDJ - Upgrade code cleanup - The upgrade context is now set in the CLI. - The upgrade context contains now the callback handler which simplify all the function (removed all calls to callbackhandler, functions just need the context at this point). - The context contains the CLI user selected options which simplify the code, removed the CheckCLIUserOption, the task have just to check the context for those parameters. - Removed the useless VerificationCallback.java - Added a TaskType in UpgradeTask.java. - Added function verifyTaskType in UpgradeTasks.java which verify user selected options are correct. - Modified tools.properties message numbers --- opends/src/messages/messages/tools.properties | 74 ++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 38 deletions(-) diff --git a/opends/src/messages/messages/tools.properties b/opends/src/messages/messages/tools.properties index 4a28ef6..a35ba90 100644 --- a/opends/src/messages/messages/tools.properties +++ b/opends/src/messages/messages/tools.properties @@ -2628,63 +2628,61 @@ or restore capabilities. Therefore, it is the responsibility of the OpenDJ administrator to take \ necessary precautions before performing the upgrade SEVERE_ERR_UPGRADE_MAIN_UPGRADE_PROCESS_1800=The upgrade failed to complete for the following reason: %s -INFO_UPGRADE_SUCCESSFUL_1802=OpenDJ was successfully upgraded from version %s to %s -INFO_UPGRADE_PERFORMING_TASKS_1804=Performing upgrade -INFO_UPGRADE_TITLE_1805=OpenDJ Upgrade Utility -INFO_UPGRADE_SUMMARY_1806=OpenDJ will be upgraded from version %s to %s -SEVERE_ERR_UPGRADE_REQUIRES_SERVER_OFFLINE_1811=OpenDJ cannot be upgraded because the server is currently \ +INFO_UPGRADE_SUCCESSFUL_1801=OpenDJ was successfully upgraded from version %s to %s +INFO_UPGRADE_PERFORMING_TASKS_1802=Performing upgrade +INFO_UPGRADE_TITLE_1803=OpenDJ Upgrade Utility +INFO_UPGRADE_SUMMARY_1804=OpenDJ will be upgraded from version %s to %s +SEVERE_ERR_UPGRADE_REQUIRES_SERVER_OFFLINE_1805=OpenDJ cannot be upgraded because the server is currently \ running. Please stop the server and try again -SEVERE_ERR_UPGRADE_VERSION_UP_TO_DATE_1812=OpenDJ has already been upgraded to version %s -SEVERE_ERR_UPGRADE_DISPLAY_NOTIFICATION_ERROR_1813=An unexpected error occurred \ +SEVERE_ERR_UPGRADE_VERSION_UP_TO_DATE_1806=OpenDJ has already been upgraded to version %s +SEVERE_ERR_UPGRADE_DISPLAY_NOTIFICATION_ERROR_1807=An unexpected error occurred \ while attempting to display a notification: %s -SEVERE_ERR_UPGRADE_DISPLAY_CONFIRM_ERROR_1814=An unexpected error occurred \ +SEVERE_ERR_UPGRADE_DISPLAY_CONFIRM_ERROR_1808=An unexpected error occurred \ while attempting to display a confirmation : %s -SEVERE_ERR_UPGRADE_DISPLAY_CHECK_ERROR_1815=An unexpected error occurred \ -while attempting to check a user's option: %s -SEVERE_ERR_UPGRADE_INVALID_USER_OPTIONS_SELECTED_1816=Invalid user's \ +SEVERE_ERR_UPGRADE_INVALID_USER_OPTIONS_SELECTED_1809=Invalid user's \ options selected -INFO_UPGRADE_CHANGE_DONE_IN_SPECIFIC_FILE_1817=...Change(s) done in %s (x%s) -INFO_UPGRADE_NO_CHANGE_DONE_IN_SPECIFIC_FILE_1818=...No change applied in %s -SEVERE_ERR_UPGRADE_TASKS_FAIL_1827=\nAn error occurred while performing an upgrade task: %s -INFO_UPGRADE_TASK_NEEDS_USER_CONFIRM_1828=%s.%nDo you want to make this configuration change? -INFO_UPGRADE_DISPLAY_CONFIRM_START_1829=The upgrade is ready to proceed. Do you \ +INFO_UPGRADE_CHANGE_DONE_IN_SPECIFIC_FILE_1810=...Change(s) done in %s (x%s) +INFO_UPGRADE_NO_CHANGE_DONE_IN_SPECIFIC_FILE_1811=...No change applied in %s +SEVERE_ERR_UPGRADE_TASKS_FAIL_1812=\nAn error occurred while performing an upgrade task: %s +INFO_UPGRADE_TASK_NEEDS_USER_CONFIRM_1813=%s.%nDo you want to make this configuration change? +INFO_UPGRADE_DISPLAY_CONFIRM_START_1814=The upgrade is ready to proceed. Do you \ wish to continue? -INFO_UPGRADE_ABORTED_BY_USER_1830=The upgrade has been canceled -SEVERE_ERR_UPGRADE_UNKNOWN_OC_ATT_1831=The %s %s doesn't exist \ +INFO_UPGRADE_ABORTED_BY_USER_1815=The upgrade has been canceled +SEVERE_ERR_UPGRADE_UNKNOWN_OC_ATT_1816=The %s %s doesn't exist \ in the template configuration -SEVERE_ERR_UPGRADE_CONFIG_ERROR_UPGRADE_FOLDER_1832=An error occurred when \ +SEVERE_ERR_UPGRADE_CONFIG_ERROR_UPGRADE_FOLDER_1817=An error occurred when \ trying to upgrade the config/upgrade folder: %s -INFO_UPGRADE_REQUIREMENTS_1833=Preparing to upgrade -INFO_UPGRADE_VERSION_IS_NOT_SUPPORTED_1836=This tool cannot be used for \ +INFO_UPGRADE_REQUIREMENTS_1818=Preparing to upgrade +INFO_UPGRADE_VERSION_IS_NOT_SUPPORTED_1819=This tool cannot be used for \ upgrading versions of OpenDJ which are older than '%s'. Please upgrade to \ '%s' first before attempting further upgrades -INFO_LICENSE_CLI_ACCEPT_INVALID_RESPONSE_1837=Invalid response -INFO_LICENSE_DETAILS_CLI_LABEL_1838=Please read the License Agreement above.%n\ +INFO_LICENSE_CLI_ACCEPT_INVALID_RESPONSE_1820=Invalid response +INFO_LICENSE_DETAILS_CLI_LABEL_1821=Please read the License Agreement above.%n\ You must accept the terms of the agreement before continuing with the \ installation -INFO_LICENSE_ACCEPT_1839=Do you accept the License Agreement? -INFO_ERROR_COPYING_FILE_1840=An error occurred while copying the file '%s' to '%s' -INFO_ERROR_DELETING_DIRECTORY_1841=An error occurred while deleting directory '%s'. \ +INFO_LICENSE_ACCEPT_1822=Do you accept the License Agreement? +INFO_ERROR_COPYING_FILE_1823=An error occurred while copying the file '%s' to '%s' +INFO_ERROR_DELETING_DIRECTORY_1824=An error occurred while deleting directory '%s'. \ Check that you have the rights to delete this directory and that there is no other \ application using it -INFO_ERROR_DELETING_FILE_1843=An error occurred while deleting file '%s'. Check \ +INFO_ERROR_DELETING_FILE_1825=An error occurred while deleting file '%s'. Check \ that you have the rights to delete this file and that there is no other application using it -INFO_ERROR_RENAMING_FILE_1844=An error occurred while renaming file '%s' to '%s' -SEVERE_ERR_UPGRADE_FAILS_1846=The upgrade failed because %d errors were \ +INFO_ERROR_RENAMING_FILE_1826=An error occurred while renaming file '%s' to '%s' +SEVERE_ERR_UPGRADE_FAILS_1827=The upgrade failed because %d errors were \ encountered. Please check log for further details -SEVERE_ERR_UPGRADE_COPYSCHEMA_FAILS_1847=An error occurred while copying \ +SEVERE_ERR_UPGRADE_COPYSCHEMA_FAILS_1828=An error occurred while copying \ the schema file '%s': %s -SEVERE_ERR_UPGRADE_ADDATTRIBUTE_FAILS_1848=An error occurred while adding \ +SEVERE_ERR_UPGRADE_ADDATTRIBUTE_FAILS_1829=An error occurred while adding \ one or more attributes to the schema file '%s': %s -SEVERE_ERR_UPGRADE_ADDOBJECTCLASS_FAILS_1849=An error occurred while adding \ +SEVERE_ERR_UPGRADE_ADDOBJECTCLASS_FAILS_1830=An error occurred while adding \ one or more object classes to the schema file '%s': %s -INFO_UPGRADE_GENERAL_SEE_FOR_DETAILS_1850=See '%s' for a detailed log of this operation -INFO_UPGRADE_TASK_REPLACE_SCHEMA_FILE_1851=Replacing schema file '%s' -INFO_UPGRADE_TASK_REFRESH_UPGRADE_DIRECTORY_1852=Archiving concatenated schema -INFO_UPGRADE_TASK_ADD_CONFIG_FILE_1853=Adding '%s' configuration file -SEVERE_ERR_UPGRADE_ADD_CONFIG_FILE_FAILS_1854=An error occurred while adding \ +INFO_UPGRADE_GENERAL_SEE_FOR_DETAILS_1831=See '%s' for a detailed log of this operation +INFO_UPGRADE_TASK_REPLACE_SCHEMA_FILE_1832=Replacing schema file '%s' +INFO_UPGRADE_TASK_REFRESH_UPGRADE_DIRECTORY_1833=Archiving concatenated schema +INFO_UPGRADE_TASK_ADD_CONFIG_FILE_1834=Adding '%s' configuration file +SEVERE_ERR_UPGRADE_ADD_CONFIG_FILE_FAILS_1835=An error occurred while adding \ configuration file '%s': %s -INFO_OPTION_ACCEPT_LICENSE_1855=Automatically accepts the product license \ +INFO_OPTION_ACCEPT_LICENSE_1836=Automatically accepts the product license \ (if present) # Upgrade tasks -- Gitblit v1.10.0