From 1d5d1a6a4a0a58d6bb4803527dacb6641c027816 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 28 Jan 2014 13:34:12 +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 | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 60e7c62..ef1a702 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
@@ -41,8 +41,8 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.util.logging.Logger;
-import java.util.logging.Level;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+
@@ -83,8 +83,7 @@
/**
* Upgrade's Log.
*/
- static private final Logger LOG = Logger
- .getLogger(UpgradeCli.class.getName());
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -187,8 +186,8 @@
}
else
{
- LOG.log(Level.INFO, new StringBuilder("File '").append(file.toString())
- .append("' does not exist").toString());
+ logger.debug(LocalizableMessage.raw(new StringBuilder("File '").append(file.toString())
+ .append("' does not exist").toString()));
}
}
@@ -373,7 +372,7 @@
{
final LocalizableMessage message = LocalizableMessage.raw("Copying file '%s' to '%s'",
objectFile.getAbsolutePath(), destination.getAbsolutePath());
- LOG.log(Level.INFO, message.toString());
+ logger.debug(LocalizableMessage.raw(message.toString()));
FileInputStream fis = null;
FileOutputStream fos = null;
try
@@ -417,7 +416,7 @@
{
final LocalizableMessage errMsg = INFO_ERROR_COPYING_FILE.get(
objectFile.getAbsolutePath(), destination.getAbsolutePath());
- LOG.log(Level.SEVERE, errMsg.toString());
+ logger.error(LocalizableMessage.raw(errMsg.toString()));
throw new IOException(errMsg.toString());
}
}
@@ -427,7 +426,7 @@
"Ignoring file '%s' since '%s' already exists",
objectFile.getAbsolutePath(), destination.getAbsolutePath());
- LOG.log(Level.INFO, message.toString());
+ logger.debug(LocalizableMessage.raw(message.toString()));
}
}
}
@@ -547,8 +546,8 @@
File file = getObjectFile();
boolean isFile = file.isFile();
- LOG.log(Level.INFO, "deleting " + (isFile ? " file " : " directory ")
- + file.getAbsolutePath());
+ logger.debug(LocalizableMessage.raw("deleting " + (isFile ? " file " : " directory ")
+ + file.getAbsolutePath()));
boolean delete = false;
/*
--
Gitblit v1.10.0