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/FileManager.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/FileManager.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/FileManager.java
index f6ad36b..60e7c62 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/FileManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/FileManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2012-2013 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.tools.upgrade;
@@ -31,7 +31,7 @@
import static org.opends.messages.ToolMessages.*;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.FilePermission;
import org.opends.server.util.StaticUtils;
@@ -371,7 +371,7 @@
{
if (insureParentsExist(destination))
{
- final Message message = Message.raw("Copying file '%s' to '%s'",
+ final LocalizableMessage message = LocalizableMessage.raw("Copying file '%s' to '%s'",
objectFile.getAbsolutePath(), destination.getAbsolutePath());
LOG.log(Level.INFO, message.toString());
FileInputStream fis = null;
@@ -404,7 +404,7 @@
}
catch (Exception e)
{
- final Message errMsg = INFO_ERROR_COPYING_FILE.get(
+ final LocalizableMessage errMsg = INFO_ERROR_COPYING_FILE.get(
objectFile.getAbsolutePath(), destination.getAbsolutePath());
throw new IOException(errMsg.toString(), e);
}
@@ -415,7 +415,7 @@
}
else
{
- final Message errMsg = INFO_ERROR_COPYING_FILE.get(
+ final LocalizableMessage errMsg = INFO_ERROR_COPYING_FILE.get(
objectFile.getAbsolutePath(), destination.getAbsolutePath());
LOG.log(Level.SEVERE, errMsg.toString());
throw new IOException(errMsg.toString());
@@ -423,7 +423,7 @@
}
else
{
- final Message message = Message.raw(
+ final LocalizableMessage message = LocalizableMessage.raw(
"Ignoring file '%s' since '%s' already exists",
objectFile.getAbsolutePath(), destination.getAbsolutePath());
@@ -589,7 +589,7 @@
if (!delete)
{
- Message errMsg;
+ LocalizableMessage errMsg;
if (isFile)
{
errMsg = INFO_ERROR_DELETING_FILE.get(file.getAbsolutePath());
--
Gitblit v1.10.0