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/tasks/ExportTask.java | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/ExportTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/ExportTask.java
index 78e407f..32c0a9e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/ExportTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/ExportTask.java
@@ -25,7 +25,7 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.tasks;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.messages.TaskMessages;
import static org.opends.server.core.DirectoryServer.getAttributeType;
@@ -68,8 +68,8 @@
/**
* Stores mapping between configuration attribute name and its label.
*/
- static private Map<String,Message> argDisplayMap =
- new HashMap<String,Message>();
+ static private Map<String,LocalizableMessage> argDisplayMap =
+ new HashMap<String,LocalizableMessage>();
static {
argDisplayMap.put(
ATTR_TASK_EXPORT_LDIF_FILE,
@@ -144,14 +144,14 @@
/**
* {@inheritDoc}
*/
- public Message getDisplayName() {
+ public LocalizableMessage getDisplayName() {
return INFO_TASK_EXPORT_NAME.get();
}
/**
* {@inheritDoc}
*/
- public Message getAttributeDisplayName(String name) {
+ public LocalizableMessage getAttributeDisplayName(String name) {
return argDisplayMap.get(name);
}
@@ -168,7 +168,7 @@
ClientConnection clientConnection = operation.getClientConnection();
if (! clientConnection.hasPrivilege(Privilege.LDIF_EXPORT, operation))
{
- Message message = ERR_TASK_LDIFEXPORT_INSUFFICIENT_PRIVILEGES.get();
+ LocalizableMessage message = ERR_TASK_LDIFEXPORT_INSUFFICIENT_PRIVILEGES.get();
throw new DirectoryException(ResultCode.INSUFFICIENT_ACCESS_RIGHTS,
message);
}
@@ -286,7 +286,7 @@
/**
* {@inheritDoc}
*/
- public void interruptTask(TaskState interruptState, Message interruptReason)
+ public void interruptTask(TaskState interruptState, LocalizableMessage interruptReason)
{
if (TaskState.STOPPED_BY_ADMINISTRATOR.equals(interruptState) &&
exportConfig != null)
@@ -372,14 +372,14 @@
}
catch (DirectoryException de)
{
- Message message = ERR_LDIFEXPORT_CANNOT_PARSE_EXCLUDE_FILTER.get(
+ LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_PARSE_EXCLUDE_FILTER.get(
filterString, de.getMessageObject());
logError(message);
return TaskState.STOPPED_BY_ERROR;
}
catch (Exception e)
{
- Message message = ERR_LDIFEXPORT_CANNOT_PARSE_EXCLUDE_FILTER.get(
+ LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_PARSE_EXCLUDE_FILTER.get(
filterString, getExceptionMessage(e));
logError(message);
return TaskState.STOPPED_BY_ERROR;
@@ -403,14 +403,14 @@
}
catch (DirectoryException de)
{
- Message message = ERR_LDIFEXPORT_CANNOT_PARSE_INCLUDE_FILTER.get(
+ LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_PARSE_INCLUDE_FILTER.get(
filterString, de.getMessageObject());
logError(message);
return TaskState.STOPPED_BY_ERROR;
}
catch (Exception e)
{
- Message message = ERR_LDIFEXPORT_CANNOT_PARSE_INCLUDE_FILTER.get(
+ LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_PARSE_INCLUDE_FILTER.get(
filterString, getExceptionMessage(e));
logError(message);
return TaskState.STOPPED_BY_ERROR;
@@ -426,13 +426,13 @@
if (backend == null)
{
- Message message = ERR_LDIFEXPORT_NO_BACKENDS_FOR_ID.get(backendID);
+ LocalizableMessage message = ERR_LDIFEXPORT_NO_BACKENDS_FOR_ID.get(backendID);
logError(message);
return TaskState.STOPPED_BY_ERROR;
}
else if (! backend.supportsLDIFExport())
{
- Message message = ERR_LDIFEXPORT_CANNOT_EXPORT_BACKEND.get(backendID);
+ LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_EXPORT_BACKEND.get(backendID);
logError(message);
return TaskState.STOPPED_BY_ERROR;
}
@@ -455,14 +455,14 @@
}
catch (DirectoryException de)
{
- Message message = ERR_LDIFEXPORT_CANNOT_DECODE_EXCLUDE_BASE.get(
+ LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_DECODE_EXCLUDE_BASE.get(
s, de.getMessageObject());
logError(message);
return TaskState.STOPPED_BY_ERROR;
}
catch (Exception e)
{
- Message message = ERR_LDIFEXPORT_CANNOT_DECODE_EXCLUDE_BASE.get(
+ LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_DECODE_EXCLUDE_BASE.get(
s, getExceptionMessage(e));
logError(message);
return TaskState.STOPPED_BY_ERROR;
@@ -489,14 +489,14 @@
}
catch (DirectoryException de)
{
- Message message = ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE.get(
+ LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE.get(
s, de.getMessageObject());
logError(message);
return TaskState.STOPPED_BY_ERROR;
}
catch (Exception e)
{
- Message message = ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE.get(
+ LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE.get(
s, getExceptionMessage(e));
logError(message);
return TaskState.STOPPED_BY_ERROR;
@@ -505,7 +505,7 @@
if (! Backend.handlesEntry(includeBranch, defaultIncludeBranches,
excludeBranches))
{
- Message message =
+ LocalizableMessage message =
ERR_LDIFEXPORT_INVALID_INCLUDE_BASE.get(s, backendID);
logError(message);
return TaskState.STOPPED_BY_ERROR;
@@ -563,7 +563,7 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
{
- Message message = ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND.get(
+ LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND.get(
backend.getBackendID(), String.valueOf(failureReason));
logError(message);
return TaskState.STOPPED_BY_ERROR;
@@ -571,7 +571,7 @@
}
catch (Exception e)
{
- Message message = ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND.get(
+ LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND.get(
backend.getBackendID(), getExceptionMessage(e));
logError(message);
return TaskState.STOPPED_BY_ERROR;
@@ -592,7 +592,7 @@
catch (DirectoryException de)
{
DirectoryServer.notifyExportEnded(backend, exportConfig, false);
- Message message =
+ LocalizableMessage message =
ERR_LDIFEXPORT_ERROR_DURING_EXPORT.get(de.getMessageObject());
logError(message);
return TaskState.STOPPED_BY_ERROR;
@@ -600,7 +600,7 @@
catch (Exception e)
{
DirectoryServer.notifyExportEnded(backend, exportConfig, false);
- Message message =
+ LocalizableMessage message =
ERR_LDIFEXPORT_ERROR_DURING_EXPORT.get(getExceptionMessage(e));
logError(message);
return TaskState.STOPPED_BY_ERROR;
@@ -615,7 +615,7 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- Message message = WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND.get(
+ LocalizableMessage message = WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND.get(
backend.getBackendID(), String.valueOf(failureReason));
logError(message);
return TaskState.COMPLETED_WITH_ERRORS;
@@ -623,7 +623,7 @@
}
catch (Exception e)
{
- Message message = WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND.get(
+ LocalizableMessage message = WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND.get(
backend.getBackendID(), getExceptionMessage(e));
logError(message);
return TaskState.COMPLETED_WITH_ERRORS;
--
Gitblit v1.10.0