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/backends/task/RecurringTask.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/task/RecurringTask.java b/opendj3-server-dev/src/server/org/opends/server/backends/task/RecurringTask.java
index f7303ff..2cc3dc3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/task/RecurringTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/task/RecurringTask.java
@@ -29,7 +29,7 @@
import java.util.Arrays;
import java.util.Date;
import java.util.GregorianCalendar;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
@@ -169,14 +169,14 @@
List<Attribute> attrList = recurringTaskEntry.getAttribute(attrType);
if ((attrList == null) || attrList.isEmpty())
{
- Message message =
+ LocalizableMessage message =
ERR_RECURRINGTASK_NO_ID_ATTRIBUTE.get(ATTR_RECURRING_TASK_ID);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
if (attrList.size() > 1)
{
- Message message =
+ LocalizableMessage message =
ERR_RECURRINGTASK_MULTIPLE_ID_TYPES.get(ATTR_RECURRING_TASK_ID);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
@@ -184,7 +184,7 @@
Attribute attr = attrList.get(0);
if (attr.isEmpty())
{
- Message message = ERR_RECURRINGTASK_NO_ID.get(ATTR_RECURRING_TASK_ID);
+ LocalizableMessage message = ERR_RECURRINGTASK_NO_ID.get(ATTR_RECURRING_TASK_ID);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
@@ -192,7 +192,7 @@
AttributeValue value = iterator.next();
if (iterator.hasNext())
{
- Message message =
+ LocalizableMessage message =
ERR_RECURRINGTASK_MULTIPLE_ID_VALUES.get(ATTR_RECURRING_TASK_ID);
throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
}
@@ -212,14 +212,14 @@
attrList = recurringTaskEntry.getAttribute(attrType);
if ((attrList == null) || attrList.isEmpty())
{
- Message message = ERR_RECURRINGTASK_NO_SCHEDULE_ATTRIBUTE.get(
+ LocalizableMessage message = ERR_RECURRINGTASK_NO_SCHEDULE_ATTRIBUTE.get(
ATTR_RECURRING_TASK_SCHEDULE);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
if (attrList.size() > 1)
{
- Message message = ERR_RECURRINGTASK_MULTIPLE_SCHEDULE_TYPES.get(
+ LocalizableMessage message = ERR_RECURRINGTASK_MULTIPLE_SCHEDULE_TYPES.get(
ATTR_RECURRING_TASK_SCHEDULE);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
@@ -227,7 +227,7 @@
attr = attrList.get(0);
if (attr.isEmpty())
{
- Message message = ERR_RECURRINGTASK_NO_SCHEDULE_VALUES.get(
+ LocalizableMessage message = ERR_RECURRINGTASK_NO_SCHEDULE_VALUES.get(
ATTR_RECURRING_TASK_SCHEDULE);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
@@ -236,7 +236,7 @@
value = iterator.next();
if (iterator.hasNext())
{
- Message message = ERR_RECURRINGTASK_MULTIPLE_SCHEDULE_VALUES.get(
+ LocalizableMessage message = ERR_RECURRINGTASK_MULTIPLE_SCHEDULE_VALUES.get(
ATTR_RECURRING_TASK_SCHEDULE);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
@@ -264,14 +264,14 @@
attrList = recurringTaskEntry.getAttribute(attrType);
if ((attrList == null) || attrList.isEmpty())
{
- Message message = ERR_TASKSCHED_NO_CLASS_ATTRIBUTE.get(
+ LocalizableMessage message = ERR_TASKSCHED_NO_CLASS_ATTRIBUTE.get(
ATTR_TASK_CLASS);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
if (attrList.size() > 1)
{
- Message message = ERR_TASKSCHED_MULTIPLE_CLASS_TYPES.get(
+ LocalizableMessage message = ERR_TASKSCHED_MULTIPLE_CLASS_TYPES.get(
ATTR_TASK_CLASS);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
@@ -279,7 +279,7 @@
attr = attrList.get(0);
if (attr.isEmpty())
{
- Message message =
+ LocalizableMessage message =
ERR_TASKSCHED_NO_CLASS_VALUES.get(ATTR_TASK_CLASS);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
@@ -288,7 +288,7 @@
value = iterator.next();
if (iterator.hasNext())
{
- Message message = ERR_TASKSCHED_MULTIPLE_CLASS_VALUES.get(
+ LocalizableMessage message = ERR_TASKSCHED_MULTIPLE_CLASS_VALUES.get(
ATTR_TASK_CLASS);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
@@ -309,7 +309,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_RECURRINGTASK_CANNOT_LOAD_CLASS.
+ LocalizableMessage message = ERR_RECURRINGTASK_CANNOT_LOAD_CLASS.
get(String.valueOf(taskClassName), ATTR_TASK_CLASS,
getExceptionMessage(e));
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
@@ -329,7 +329,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_RECURRINGTASK_CANNOT_INSTANTIATE_CLASS_AS_TASK.get(
+ LocalizableMessage message = ERR_RECURRINGTASK_CANNOT_INSTANTIATE_CLASS_AS_TASK.get(
String.valueOf(taskClassName), Task.class.getName());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
e);
@@ -349,7 +349,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ie);
}
- Message message = ERR_RECURRINGTASK_CANNOT_INITIALIZE_INTERNAL.get(
+ LocalizableMessage message = ERR_RECURRINGTASK_CANNOT_INITIALIZE_INTERNAL.get(
String.valueOf(taskClassName), ie.getMessage());
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, ie);
--
Gitblit v1.10.0