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/MemoryBackend.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java
index 7c35f4c..6cbb167 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java
@@ -34,7 +34,7 @@
import java.util.LinkedList;
import java.util.Set;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.Configuration;
import org.opends.server.admin.std.server.MemoryBackendCfg;
import org.opends.server.api.Backend;
@@ -189,7 +189,7 @@
// map.
if ((baseDNs == null) || (baseDNs.length != 1))
{
- Message message = ERR_MEMORYBACKEND_REQUIRE_EXACTLY_ONE_BASE.get();
+ LocalizableMessage message = ERR_MEMORYBACKEND_REQUIRE_EXACTLY_ONE_BASE.get();
throw new ConfigException(message);
}
@@ -220,7 +220,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
+ LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
dn.toString(), getExceptionMessage(e));
throw new InitializationException(message, e);
}
@@ -415,7 +415,7 @@
DN entryDN = e.getName();
if (entryMap.containsKey(entryDN))
{
- Message message =
+ LocalizableMessage message =
ERR_MEMORYBACKEND_ENTRY_ALREADY_EXISTS.get(String.valueOf(entryDN));
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
}
@@ -433,13 +433,13 @@
DN parentDN = entryDN.getParentDNInSuffix();
if (parentDN == null)
{
- Message message =
+ LocalizableMessage message =
ERR_MEMORYBACKEND_ENTRY_DOESNT_BELONG.get(String.valueOf(entryDN));
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
}
else if (! entryMap.containsKey(parentDN))
{
- Message message = ERR_MEMORYBACKEND_PARENT_DOESNT_EXIST.get(
+ LocalizableMessage message = ERR_MEMORYBACKEND_PARENT_DOESNT_EXIST.get(
String.valueOf(entryDN), String.valueOf(parentDN));
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
}
@@ -468,7 +468,7 @@
// Make sure the entry exists. If not, then throw an exception.
if (! entryMap.containsKey(entryDN))
{
- Message message =
+ LocalizableMessage message =
ERR_MEMORYBACKEND_ENTRY_DOESNT_EXIST.get(String.valueOf(entryDN));
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
}
@@ -514,7 +514,7 @@
// an exception.
if ((children != null) && (! children.isEmpty()))
{
- Message message = ERR_MEMORYBACKEND_CANNOT_DELETE_ENTRY_WITH_CHILDREN.
+ LocalizableMessage message = ERR_MEMORYBACKEND_CANNOT_DELETE_ENTRY_WITH_CHILDREN.
get(String.valueOf(entryDN));
throw new DirectoryException(
ResultCode.NOT_ALLOWED_ON_NONLEAF, message);
@@ -557,7 +557,7 @@
DN entryDN = e.getName();
if (! entryMap.containsKey(entryDN))
{
- Message message =
+ LocalizableMessage message =
ERR_MEMORYBACKEND_ENTRY_DOESNT_EXIST.get(String.valueOf(entryDN));
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
}
@@ -582,7 +582,7 @@
// Make sure that the target entry exists.
if (! entryMap.containsKey(currentDN))
{
- Message message =
+ LocalizableMessage message =
ERR_MEMORYBACKEND_ENTRY_DOESNT_EXIST.get(String.valueOf(currentDN));
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
}
@@ -598,7 +598,7 @@
}
else
{
- Message message = ERR_MEMORYBACKEND_CANNOT_RENAME_ENRY_WITH_CHILDREN.
+ LocalizableMessage message = ERR_MEMORYBACKEND_CANNOT_RENAME_ENRY_WITH_CHILDREN.
get(String.valueOf(currentDN));
throw new DirectoryException(
ResultCode.NOT_ALLOWED_ON_NONLEAF, message);
@@ -609,7 +609,7 @@
// Make sure that no entry exists with the new DN.
if (entryMap.containsKey(e.getName()))
{
- Message message = ERR_MEMORYBACKEND_ENTRY_ALREADY_EXISTS.get(
+ LocalizableMessage message = ERR_MEMORYBACKEND_ENTRY_ALREADY_EXISTS.get(
String.valueOf(e.getName()));
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
}
@@ -628,7 +628,7 @@
if (! matchFound)
{
- Message message = ERR_MEMORYBACKEND_CANNOT_RENAME_TO_ANOTHER_BACKEND.get(
+ LocalizableMessage message = ERR_MEMORYBACKEND_CANNOT_RENAME_TO_ANOTHER_BACKEND.get(
String.valueOf(currentDN));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
@@ -638,7 +638,7 @@
DN parentDN = e.getName().getParentDNInSuffix();
if ((parentDN == null) || (! entryMap.containsKey(parentDN)))
{
- Message message = ERR_MEMORYBACKEND_RENAME_PARENT_DOESNT_EXIST.get(
+ LocalizableMessage message = ERR_MEMORYBACKEND_RENAME_PARENT_DOESNT_EXIST.get(
String.valueOf(currentDN), String.valueOf(parentDN));
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
}
@@ -679,7 +679,7 @@
matchedDN = matchedDN.getParentDNInSuffix();
}
- Message message =
+ LocalizableMessage message =
ERR_MEMORYBACKEND_ENTRY_DOESNT_EXIST.get(String.valueOf(baseDN));
throw new DirectoryException(
ResultCode.NO_SUCH_OBJECT, message, matchedDN, null);
@@ -769,7 +769,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message =
+ LocalizableMessage message =
ERR_MEMORYBACKEND_CANNOT_CREATE_LDIF_WRITER.get(String.valueOf(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
@@ -788,7 +788,7 @@
}
catch (Exception e)
{
- Message message = ERR_MEMORYBACKEND_CANNOT_WRITE_ENTRY_TO_LDIF.get(
+ LocalizableMessage message = ERR_MEMORYBACKEND_CANNOT_WRITE_ENTRY_TO_LDIF.get(
String.valueOf(entryDN), String.valueOf(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
@@ -838,7 +838,7 @@
}
catch (Exception e)
{
- Message message =
+ LocalizableMessage message =
ERR_MEMORYBACKEND_CANNOT_CREATE_LDIF_READER.get(String.valueOf(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
@@ -862,7 +862,7 @@
{
if (! le.canContinueReading())
{
- Message message =
+ LocalizableMessage message =
ERR_MEMORYBACKEND_ERROR_READING_LDIF.get(String.valueOf(e));
throw new DirectoryException(
DirectoryServer.getServerErrorResultCode(),
@@ -894,7 +894,7 @@
}
catch (Exception e)
{
- Message message =
+ LocalizableMessage message =
ERR_MEMORYBACKEND_ERROR_DURING_IMPORT.get(String.valueOf(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
@@ -939,7 +939,7 @@
public void createBackup(BackupConfig backupConfig)
throws DirectoryException
{
- Message message = ERR_MEMORYBACKEND_BACKUP_RESTORE_NOT_SUPPORTED.get();
+ LocalizableMessage message = ERR_MEMORYBACKEND_BACKUP_RESTORE_NOT_SUPPORTED.get();
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
@@ -953,7 +953,7 @@
String backupID)
throws DirectoryException
{
- Message message = ERR_MEMORYBACKEND_BACKUP_RESTORE_NOT_SUPPORTED.get();
+ LocalizableMessage message = ERR_MEMORYBACKEND_BACKUP_RESTORE_NOT_SUPPORTED.get();
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
@@ -978,7 +978,7 @@
public void restoreBackup(RestoreConfig restoreConfig)
throws DirectoryException
{
- Message message = ERR_MEMORYBACKEND_BACKUP_RESTORE_NOT_SUPPORTED.get();
+ LocalizableMessage message = ERR_MEMORYBACKEND_BACKUP_RESTORE_NOT_SUPPORTED.get();
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
--
Gitblit v1.10.0