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/config/ConfigEntry.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java b/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
index 31db274..9234d9c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
@@ -32,7 +32,7 @@
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.ConfigAddListener;
import org.opends.server.api.ConfigChangeListener;
import org.opends.server.api.ConfigDeleteListener;
@@ -349,7 +349,7 @@
if (conflictingChild != null)
{
- Message message = ERR_CONFIG_ENTRY_CONFLICTING_CHILD.get(
+ LocalizableMessage message = ERR_CONFIG_ENTRY_CONFLICTING_CHILD.get(
conflictingChild.getDN().toString(), entry.getName().toString());
throw new ConfigException(message);
}
@@ -381,14 +381,14 @@
ConfigEntry childEntry = children.get(childDN);
if (childEntry == null)
{
- Message message = ERR_CONFIG_ENTRY_NO_SUCH_CHILD.get(
+ LocalizableMessage message = ERR_CONFIG_ENTRY_NO_SUCH_CHILD.get(
childDN.toString(), entry.getName().toString());
throw new ConfigException(message);
}
if (childEntry.hasChildren())
{
- Message message = ERR_CONFIG_ENTRY_CANNOT_REMOVE_NONLEAF.get(
+ LocalizableMessage message = ERR_CONFIG_ENTRY_CANNOT_REMOVE_NONLEAF.get(
childDN.toString(), entry.getName().toString());
throw new ConfigException(message);
}
@@ -407,7 +407,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_CONFIG_ENTRY_CANNOT_REMOVE_CHILD.
+ LocalizableMessage message = ERR_CONFIG_ENTRY_CANNOT_REMOVE_CHILD.
get(String.valueOf(childDN), String.valueOf(entry.getName()),
stackTraceToSingleLineString(e));
throw new ConfigException(message, e);
--
Gitblit v1.10.0