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/tasks/ImportTask.java | 81 +++++++++++-----------------------------
1 files changed, 23 insertions(+), 58 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java
index 1eb943c..15d0165 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java
@@ -639,9 +639,7 @@
}
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 TaskState.STOPPED_BY_ERROR;
}
}
@@ -656,9 +654,7 @@
}
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 TaskState.STOPPED_BY_ERROR;
}
}
@@ -681,16 +677,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 TaskState.STOPPED_BY_ERROR;
}
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 TaskState.STOPPED_BY_ERROR;
}
@@ -706,14 +698,12 @@
if (backend == null)
{
- LocalizableMessage message = ERR_LDIFIMPORT_NO_BACKENDS_FOR_ID.get();
- logError(message);
+ logger.error(ERR_LDIFIMPORT_NO_BACKENDS_FOR_ID);
return TaskState.STOPPED_BY_ERROR;
}
else if (! backend.supportsLDIFImport())
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_IMPORT.get(backendID);
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_IMPORT, backendID);
return TaskState.STOPPED_BY_ERROR;
}
// Make sure that if the "backendID" argument was provided, no include
@@ -730,9 +720,7 @@
builder.append(" / ");
builder.append(backend.getBaseDNs()[i].toNormalizedString());
}
- LocalizableMessage message = ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND.get(
- builder.toString(), ATTR_IMPORT_CLEAR_BACKEND);
- logError(message);
+ logger.error(ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND, builder.toString(), ATTR_IMPORT_CLEAR_BACKEND);
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -751,9 +739,8 @@
else if(backend != locatedBackend)
{
// The include branches span across multiple backends.
- LocalizableMessage message = ERR_LDIFIMPORT_INVALID_INCLUDE_BASE.get(
- includeBranch.toNormalizedString(), backend.getBackendID());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_INVALID_INCLUDE_BASE, includeBranch
+ .toNormalizedString(), backend.getBackendID());
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -801,16 +788,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 TaskState.STOPPED_BY_ERROR;
}
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 TaskState.STOPPED_BY_ERROR;
}
@@ -832,9 +815,7 @@
if (! Backend.handlesEntry(includeBranch, defaultIncludeBranches,
excludeBranches))
{
- LocalizableMessage message = ERR_LDIFIMPORT_INVALID_INCLUDE_BASE.get(
- includeBranch.toNormalizedString(), backend.getBackendID());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_INVALID_INCLUDE_BASE, includeBranch.toNormalizedString(), backend.getBackendID());
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -864,9 +845,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE.get(
- templateFile, e.getMessage());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE, templateFile, e.getMessage());
return TaskState.STOPPED_BY_ERROR;
}
@@ -918,9 +897,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_OPEN_REJECTS_FILE.get(
- rejectFile, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_OPEN_REJECTS_FILE, rejectFile, getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -942,9 +919,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_OPEN_SKIP_FILE.get(
- skipFile, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_OPEN_SKIP_FILE, skipFile, getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -968,7 +943,7 @@
{
logger.traceException(e);
- logError(e.getMessageObject());
+ logger.error(e.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
@@ -982,9 +957,7 @@
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 TaskState.STOPPED_BY_ERROR;
}
}
@@ -992,9 +965,7 @@
{
logger.traceException(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 TaskState.STOPPED_BY_ERROR;
}
@@ -1021,7 +992,7 @@
message = ERR_LDIFIMPORT_ERROR_DURING_IMPORT.get(
de.getMessageObject());
}
- logError(message);
+ logger.error(message);
return TaskState.STOPPED_BY_ERROR;
}
catch (Exception e)
@@ -1029,9 +1000,7 @@
logger.traceException(e);
DirectoryServer.notifyImportEnded(backend, importConfig, false);
- LocalizableMessage message =
- ERR_LDIFIMPORT_ERROR_DURING_IMPORT.get(getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_ERROR_DURING_IMPORT, getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
finally
@@ -1043,9 +1012,7 @@
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));
return TaskState.COMPLETED_WITH_ERRORS;
}
}
@@ -1053,9 +1020,7 @@
{
logger.traceException(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));
return TaskState.COMPLETED_WITH_ERRORS;
}
@@ -1076,7 +1041,7 @@
{
logger.traceException(e);
- logError(e.getMessageObject());
+ logger.error(e.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
DirectoryServer.notifyImportEnded(backend, importConfig, true);
--
Gitblit v1.10.0