From a06fd90c9b6bfb5f9130146373ba18e5769593b6 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 29 Jan 2014 11:30:37 +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/ImportLDIF.java | 90 +++++++++++++-------------------------------
1 files changed, 27 insertions(+), 63 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java b/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
index 14b8002..cccd3c5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
@@ -29,8 +29,8 @@
import static org.opends.messages.ToolMessages.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -90,6 +90,9 @@
* server process (e.g., via the tasks interface).
*/
public class ImportLDIF extends TaskTool {
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The buffer size that should be used when reading data from LDIF.
*/
@@ -1077,16 +1080,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_PARSE_EXCLUDE_FILTER.get(
- filterString, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_PARSE_EXCLUDE_FILTER, filterString, de.getMessageObject());
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_PARSE_EXCLUDE_FILTER.get(
- filterString, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_PARSE_EXCLUDE_FILTER, filterString, getExceptionMessage(e));
return 1;
}
}
@@ -1108,16 +1107,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_PARSE_INCLUDE_FILTER.get(
- filterString, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_PARSE_INCLUDE_FILTER, filterString, de.getMessageObject());
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_PARSE_INCLUDE_FILTER.get(
- filterString, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_PARSE_INCLUDE_FILTER, filterString, getExceptionMessage(e));
return 1;
}
}
@@ -1145,16 +1140,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE.get(
- s, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE, s, de.getMessageObject());
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE.get(
- s, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE, s, getExceptionMessage(e));
return 1;
}
@@ -1214,23 +1205,19 @@
}
else
{
- LocalizableMessage message = ERR_LDIFIMPORT_MULTIPLE_BACKENDS_FOR_ID.get();
- logError(message);
+ logger.error(ERR_LDIFIMPORT_MULTIPLE_BACKENDS_FOR_ID);
return 1;
}
}
if (backend == null)
{
- LocalizableMessage message =
- ERR_LDIFIMPORT_NO_BACKENDS_FOR_ID.get();
- logError(message);
+ logger.error(ERR_LDIFIMPORT_NO_BACKENDS_FOR_ID);
return 1;
}
else if (! backend.supportsLDIFImport())
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_IMPORT.get(backendID.getValue());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_IMPORT, backendID.getValue());
return 1;
}
@@ -1286,16 +1273,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_EXCLUDE_BASE.get(
- s, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_EXCLUDE_BASE, s, de.getMessageObject());
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_EXCLUDE_BASE.get(
- s, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_EXCLUDE_BASE, s, getExceptionMessage(e));
return 1;
}
@@ -1317,9 +1300,7 @@
if (! Backend.handlesEntry(includeBranch, defaultIncludeBranches,
excludeBranches))
{
- LocalizableMessage message = ERR_LDIFIMPORT_INVALID_INCLUDE_BASE.get(
- includeBranch.toNormalizedString(), backendID.getValue());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_INVALID_INCLUDE_BASE, includeBranch.toNormalizedString(), backendID.getValue());
return 1;
}
}
@@ -1337,8 +1318,7 @@
File f = new File(pathname);
if (!f.canRead())
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_READ_FILE.get(pathname);
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_READ_FILE, pathname);
badFileCount++;
}
}
@@ -1375,9 +1355,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE.get(
- templateFile.getValue(), e.getMessage());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE, templateFile.getValue(), e.getMessage());
return 1;
}
@@ -1409,7 +1387,7 @@
{
LocalizableMessage msg = ERR_LDIFIMPORT_CANNOT_PARSE_THREAD_COUNT.get(
threadCount.getValue(), e.getMessage());
- logError(msg);
+ logger.error(msg);
return 1;
}
@@ -1444,9 +1422,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_OPEN_REJECTS_FILE.get(
- rejectFile.getValue(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_OPEN_REJECTS_FILE, rejectFile.getValue(), getExceptionMessage(e));
return 1;
}
}
@@ -1470,9 +1446,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_OPEN_SKIP_FILE.get(
- skipFile.getValue(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_OPEN_SKIP_FILE, skipFile.getValue(), getExceptionMessage(e));
return 1;
}
}
@@ -1489,17 +1463,13 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireExclusiveLock(lockFile, failureReason))
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
return 1;
}
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
return 1;
}
@@ -1534,14 +1504,12 @@
{
message = ERR_LDIFIMPORT_ERROR_DURING_IMPORT.get(de.getMessageObject());
}
- logError(message);
+ logger.error(message);
retCode = 1;
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_LDIFIMPORT_ERROR_DURING_IMPORT.get(getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_ERROR_DURING_IMPORT, getExceptionMessage(e));
retCode = 1;
}
@@ -1553,17 +1521,13 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message = WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
retCode = 1;
}
}
catch (Exception e)
{
- LocalizableMessage message = WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.warn(WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
retCode = 1;
}
--
Gitblit v1.10.0