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/UpgradeTasks.java | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
index 9b9cef9..96c2f84 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -47,7 +47,7 @@
import javax.security.auth.callback.TextOutputCallback;
import org.forgerock.opendj.ldap.Filter;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.tools.ClientException;
import org.opends.server.tools.RebuildIndex;
import org.opends.server.util.BuildVersion;
@@ -95,7 +95,7 @@
* @return A new upgrade task which applies an LDIF record to all
* configuration entries matching the provided filter.
*/
- public static UpgradeTask addConfigEntry(final Message summary,
+ public static UpgradeTask addConfigEntry(final LocalizableMessage summary,
final String... ldif)
{
return addConfigEntry0(summary, summary, false, ldif);
@@ -114,8 +114,8 @@
* @return A new upgrade task which applies an LDIF record to all
* configuration entries matching the provided filter.
*/
- public static UpgradeTask addConfigEntryOptional(final Message summary,
- final Message description, final String... ldif)
+ public static UpgradeTask addConfigEntryOptional(final LocalizableMessage summary,
+ final LocalizableMessage description, final String... ldif)
{
return addConfigEntry0(summary, description, true, ldif);
}
@@ -137,7 +137,7 @@
@Override
public void perform(final UpgradeContext context) throws ClientException
{
- final Message msg = INFO_UPGRADE_TASK_REPLACE_SCHEMA_FILE.get(fileName);
+ final LocalizableMessage msg = INFO_UPGRADE_TASK_REPLACE_SCHEMA_FILE.get(fileName);
LOG.log(Level.INFO, msg.toString());
final ProgressNotificationCallback pnc =
@@ -182,7 +182,7 @@
@Override
public void perform(final UpgradeContext context) throws ClientException
{
- final Message msg = INFO_UPGRADE_TASK_ADD_CONFIG_FILE.get(fileName);
+ final LocalizableMessage msg = INFO_UPGRADE_TASK_ADD_CONFIG_FILE.get(fileName);
LOG.log(Level.INFO, msg.toString());
final ProgressNotificationCallback pnc =
@@ -219,7 +219,7 @@
* @return A new upgrade task which applies an LDIF record to all
* configuration entries matching the provided filter.
*/
- public static UpgradeTask modifyConfigEntry(final Message summary,
+ public static UpgradeTask modifyConfigEntry(final LocalizableMessage summary,
final String filter, final String... ldif)
{
return modifyConfigEntry(summary, summary, false, filter, ldif);
@@ -240,8 +240,8 @@
* @return A new upgrade task which applies an LDIF record to all
* configuration entries matching the provided filter.
*/
- public static UpgradeTask modifyConfigEntryOptional(final Message summary,
- final Message description, final String filter, final String... ldif)
+ public static UpgradeTask modifyConfigEntryOptional(final LocalizableMessage summary,
+ final LocalizableMessage description, final String filter, final String... ldif)
{
return modifyConfigEntry(summary, description, true, filter, ldif);
}
@@ -255,7 +255,7 @@
*
* <pre>
* register("2.5.0.7192",
- * newAttributeTypes(Message.raw("New attribute etag"),
+ * newAttributeTypes(LocalizableMessage.raw("New attribute etag"),
* false, "00-core.ldif",
* "1.3.6.1.4.1.36733.2.1.1.59"));
* </pre>
@@ -271,7 +271,7 @@
* in the configuration template files, reads the definition
* and adds it onto the specified file in parameter.
*/
- public static UpgradeTask newAttributeTypes(final Message summary,
+ public static UpgradeTask newAttributeTypes(final LocalizableMessage summary,
final String fileName, final String... attributeOids)
{
return new AbstractUpgradeTask()
@@ -330,7 +330,7 @@
* reads the definition and adds it onto the specified file in
* parameter.
*/
- public static UpgradeTask newObjectClasses(final Message summary,
+ public static UpgradeTask newObjectClasses(final LocalizableMessage summary,
final String fileName, final String... objectClassesOids)
{
return new AbstractUpgradeTask()
@@ -478,7 +478,7 @@
* The summary of this upgrade task.
* @return An Upgrade task which rebuild all the indexes.
*/
- public static UpgradeTask rebuildAllIndexes(final Message summary)
+ public static UpgradeTask rebuildAllIndexes(final LocalizableMessage summary)
{
return new AbstractUpgradeTask()
{
@@ -533,7 +533,7 @@
* The index to rebuild.
* @return The rebuild index task.
*/
- public static UpgradeTask rebuildSingleIndex(final Message summary,
+ public static UpgradeTask rebuildSingleIndex(final LocalizableMessage summary,
final String index)
{
return new AbstractUpgradeTask()
@@ -591,7 +591,7 @@
public void postUpgrade(final UpgradeContext context)
throws ClientException
{
- Message message = null;
+ LocalizableMessage message = null;
final List<String> args = new LinkedList<String>();
if (isRebuildAllIndexesIsPresent && isRebuildAllIndexesTaskAccepted)
@@ -666,14 +666,14 @@
}
else
{
- final Message msg = ERR_UPGRADE_PERFORMING_POST_TASKS_FAIL.get();
+ final LocalizableMessage msg = ERR_UPGRADE_PERFORMING_POST_TASKS_FAIL.get();
context.notifyProgress(pnc.setProgress(-100));
throw new ClientException(EXIT_CODE_ERROR, msg);
}
}
else
{
- final Message msg = INFO_UPGRADE_REBUILD_INDEX_NO_BACKEND_FOUND.get();
+ final LocalizableMessage msg = INFO_UPGRADE_REBUILD_INDEX_NO_BACKEND_FOUND.get();
LOG.log(Level.INFO, msg.toString());
LOG.log(Level.INFO, INFO_UPGRADE_REBUILD_INDEX_DECLINED.get(
Arrays.toString(indexesListToRebuild.toArray())).toString());
@@ -699,7 +699,7 @@
@Override
public void perform(final UpgradeContext context) throws ClientException
{
- final Message msg = INFO_UPGRADE_TASK_REFRESH_UPGRADE_DIRECTORY.get();
+ final LocalizableMessage msg = INFO_UPGRADE_TASK_REFRESH_UPGRADE_DIRECTORY.get();
LOG.log(Level.INFO, msg.toString());
final ProgressNotificationCallback pnc =
@@ -731,7 +731,7 @@
* @return An upgrade task which renames the old SNMP security config file if
* it exists.
*/
- public static UpgradeTask renameSnmpSecurityConfig(final Message summary)
+ public static UpgradeTask renameSnmpSecurityConfig(final LocalizableMessage summary)
{
return new AbstractUpgradeTask()
{
@@ -777,8 +777,8 @@
};
}
- private static UpgradeTask addConfigEntry0(final Message summary,
- final Message description, final boolean needsUserConfirmation,
+ private static UpgradeTask addConfigEntry0(final LocalizableMessage summary,
+ final LocalizableMessage description, final boolean needsUserConfirmation,
final String... ldif)
{
return new AbstractUpgradeTask()
@@ -833,8 +833,8 @@
}
catch (final Exception e)
{
- manageTaskException(context, Message.fromObject(e.getMessage()),
- pnc);
+ manageTaskException(context,
+ LocalizableMessage.raw(e.getMessage()), pnc);
}
}
}
@@ -871,7 +871,7 @@
}
private static void manageTaskException(final UpgradeContext context,
- final Message message, final ProgressNotificationCallback pnc)
+ final LocalizableMessage message, final ProgressNotificationCallback pnc)
throws ClientException
{
countErrors++;
@@ -883,8 +883,8 @@
}
}
- private static UpgradeTask modifyConfigEntry(final Message summary,
- final Message description, final boolean needsUserConfirmation,
+ private static UpgradeTask modifyConfigEntry(final LocalizableMessage summary,
+ final LocalizableMessage description, final boolean needsUserConfirmation,
final String filter, final String... ldif)
{
return new AbstractUpgradeTask()
@@ -938,8 +938,8 @@
}
catch (final Exception e)
{
- manageTaskException(context, Message.fromObject(e.getMessage()),
- pnc);
+ manageTaskException(context,
+ LocalizableMessage.raw(e.getMessage()), pnc);
}
}
}
--
Gitblit v1.10.0