From 81d36161ce5367fa7aa9a5d99dc8b80eacfa7cdf Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 24 Jan 2014 14:43:46 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
index 2222b47..c196a74 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
@@ -44,7 +44,7 @@
import javax.security.auth.callback.ConfirmationCallback;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.core.LockFileManager;
import org.opends.server.tools.ClientException;
import org.opends.server.util.BuildVersion;
@@ -413,7 +413,7 @@
ConfirmationCallback.YES);
if (userResponse == ConfirmationCallback.NO)
{
- final Message message = INFO_UPGRADE_ABORTED_BY_USER.get();
+ final LocalizableMessage message = INFO_UPGRADE_ABORTED_BY_USER.get();
context.notify(message, WARNING);
throw new ClientException(EXIT_CODE_ERROR, message);
}
@@ -464,7 +464,7 @@
}
catch (final Exception e)
{
- final Message message = ERR_UPGRADE_TASKS_FAIL.get(e.getMessage());
+ final LocalizableMessage message = ERR_UPGRADE_TASKS_FAIL.get(e.getMessage());
context.notify(message, ERROR_CALLBACK);
throw new ClientException(EXIT_CODE_ERROR, message);
}
@@ -537,7 +537,7 @@
// running.
if (!LockFileManager.acquireExclusiveLock(lockFile, failureReason))
{
- final Message message = ERR_UPGRADE_REQUIRES_SERVER_OFFLINE.get();
+ final LocalizableMessage message = ERR_UPGRADE_REQUIRES_SERVER_OFFLINE.get();
context.notify(message, NOTICE_CALLBACK);
throw new ClientException(EXIT_CODE_ERROR, message);
}
@@ -565,7 +565,7 @@
* If the server is already up to date then treat it as a successful
* upgrade so that upgrade is idempotent.
*/
- final Message message =
+ final LocalizableMessage message =
ERR_UPGRADE_VERSION_UP_TO_DATE.get(context.getToVersion().toString());
context.notify(message, NOTICE_CALLBACK);
throw new ClientException(EXIT_CODE_SUCCESS, message);
@@ -574,7 +574,7 @@
// The upgrade only supports version >= 2.4.5.
if (context.getFromVersion().compareTo(UPGRADESUPPORTSVERSIONFROM) < 0)
{
- final Message message =
+ final LocalizableMessage message =
INFO_UPGRADE_VERSION_IS_NOT_SUPPORTED.get(UPGRADESUPPORTSVERSIONFROM
.toString(), UPGRADESUPPORTSVERSIONFROM.toString());
context.notify(message, NOTICE_CALLBACK);
@@ -611,7 +611,7 @@
}
catch (IOException e)
{
- final Message message = Message.raw(e.getMessage());
+ final LocalizableMessage message = LocalizableMessage.raw(e.getMessage());
context.notify(message, ERROR_CALLBACK);
throw new ClientException(EXIT_CODE_ERROR, message);
}
@@ -629,7 +629,7 @@
{
if (LicenseFile.exists())
{
- context.notify(Message.raw("\n" + LicenseFile.getText()));
+ context.notify(LocalizableMessage.raw("\n" + LicenseFile.getText()));
context.notify(INFO_LICENSE_DETAILS_CLI_LABEL.get());
if (!context.isAcceptLicenseMode())
{
@@ -641,7 +641,7 @@
if (context.isForceUpgradeMode())
{
answer = ConfirmationCallback.NO;
- context.notify(Message.raw(INFO_LICENSE_ACCEPT.get() + " "
+ context.notify(LocalizableMessage.raw(INFO_LICENSE_ACCEPT.get() + " "
+ INFO_PROMPT_NO_COMPLETE_ANSWER.get()));
}
else
@@ -663,7 +663,7 @@
else
{
// We automatically accept the license with this option.
- context.notify(Message.raw(INFO_LICENSE_ACCEPT.get() + " "
+ context.notify(LocalizableMessage.raw(INFO_LICENSE_ACCEPT.get() + " "
+ INFO_PROMPT_YES_COMPLETE_ANSWER.get()));
LicenseFile.setApproval(true);
}
--
Gitblit v1.10.0