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/jeb/EntryContainer.java | 116 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
index a257c1d..78ebe2c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -38,8 +38,8 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.opends.messages.Message;
-import org.opends.messages.MessageBuilder;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.admin.server.ConfigurationAddListener;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.server.ConfigurationDeleteListener;
@@ -199,7 +199,7 @@
@Override
public boolean isConfigurationAddAcceptable(
LocalDBIndexCfg cfg,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
boolean isValid = true;
try
@@ -209,7 +209,7 @@
}
catch(Exception e)
{
- unacceptableReasons.add(Message.raw(e.getLocalizedMessage()));
+ unacceptableReasons.add(LocalizableMessage.raw(e.getLocalizedMessage()));
isValid = false ;
}
return isValid;
@@ -223,7 +223,7 @@
{
ConfigChangeResult ccr;
boolean adminActionRequired = false;
- List<Message> messages = new ArrayList<Message>();
+ List<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
try
{
@@ -240,7 +240,7 @@
}
catch(Exception e)
{
- messages.add(Message.raw(e.getLocalizedMessage()));
+ messages.add(LocalizableMessage.raw(e.getLocalizedMessage()));
ccr = new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(),
adminActionRequired,
messages);
@@ -256,7 +256,7 @@
*/
@Override
public boolean isConfigurationDeleteAcceptable(
- LocalDBIndexCfg cfg, List<Message> unacceptableReasons)
+ LocalDBIndexCfg cfg, List<LocalizableMessage> unacceptableReasons)
{
// TODO: validate more before returning true?
return true;
@@ -270,7 +270,7 @@
{
ConfigChangeResult ccr;
boolean adminActionRequired = false;
- ArrayList<Message> messages = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
exclusiveLock.lock();
try
@@ -281,7 +281,7 @@
}
catch(DatabaseException de)
{
- messages.add(Message.raw(StaticUtils.stackTraceToSingleLineString(de)));
+ messages.add(LocalizableMessage.raw(StaticUtils.stackTraceToSingleLineString(de)));
ccr = new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(),
adminActionRequired,
messages);
@@ -310,7 +310,7 @@
*/
@Override
public boolean isConfigurationAddAcceptable(
- LocalDBVLVIndexCfg cfg, List<Message> unacceptableReasons)
+ LocalDBVLVIndexCfg cfg, List<LocalizableMessage> unacceptableReasons)
{
try
{
@@ -318,7 +318,7 @@
}
catch(Exception e)
{
- Message msg = ERR_JEB_CONFIG_VLV_INDEX_BAD_FILTER.get(
+ LocalizableMessage msg = ERR_JEB_CONFIG_VLV_INDEX_BAD_FILTER.get(
cfg.getFilter(), cfg.getName(),
e.getLocalizedMessage());
unacceptableReasons.add(msg);
@@ -348,7 +348,7 @@
}
catch(Exception e)
{
- Message msg =
+ LocalizableMessage msg =
ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(
String.valueOf(sortKeys[i]), cfg.getName());
unacceptableReasons.add(msg);
@@ -359,7 +359,7 @@
DirectoryServer.getAttributeType(sortAttrs[i].toLowerCase());
if(attrType == null)
{
- Message msg = ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(
+ LocalizableMessage msg = ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(
sortAttrs[i], cfg.getName());
unacceptableReasons.add(msg);
return false;
@@ -378,7 +378,7 @@
{
ConfigChangeResult ccr;
boolean adminActionRequired = false;
- ArrayList<Message> messages = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
try
{
@@ -394,7 +394,7 @@
}
catch(Exception e)
{
- messages.add(Message.raw(StaticUtils.stackTraceToSingleLineString(e)));
+ messages.add(LocalizableMessage.raw(StaticUtils.stackTraceToSingleLineString(e)));
ccr = new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(),
adminActionRequired,
messages);
@@ -411,7 +411,7 @@
@Override
public boolean isConfigurationDeleteAcceptable(
LocalDBVLVIndexCfg cfg,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
// TODO: validate more before returning true?
return true;
@@ -425,7 +425,7 @@
{
ConfigChangeResult ccr;
boolean adminActionRequired = false;
- List<Message> messages = new ArrayList<Message>();
+ List<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
exclusiveLock.lock();
try
@@ -437,7 +437,7 @@
}
catch(DatabaseException de)
{
- messages.add(Message.raw(StaticUtils.stackTraceToSingleLineString(de)));
+ messages.add(LocalizableMessage.raw(StaticUtils.stackTraceToSingleLineString(de)));
ccr = new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(),
adminActionRequired,
messages);
@@ -884,7 +884,7 @@
if (vlvRequest != null && pageRequest != null)
{
- Message message = ERR_JEB_SEARCH_CANNOT_MIX_PAGEDRESULTS_AND_VLV.get();
+ LocalizableMessage message = ERR_JEB_SEARCH_CANNOT_MIX_PAGEDRESULTS_AND_VLV.get();
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
@@ -1005,7 +1005,7 @@
EntryID baseID = dn2id.get(null, aBaseDN, LockMode.DEFAULT);
if (baseID == null)
{
- Message message =
+ LocalizableMessage message =
ERR_JEB_SEARCH_NO_SUCH_OBJECT.get(aBaseDN.toString());
DN matchedDN = getMatchedDN(aBaseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
@@ -1137,7 +1137,7 @@
if(! clientConnection.hasPrivilege(Privilege.UNINDEXED_SEARCH,
searchOperation))
{
- Message message =
+ LocalizableMessage message =
ERR_JEB_SEARCH_UNINDEXED_INSUFFICIENT_PRIVILEGES.get();
throw new DirectoryException(ResultCode.INSUFFICIENT_ACCESS_RIGHTS,
message);
@@ -1153,7 +1153,7 @@
if (sortRequest.isCritical())
{
- Message message = ERR_JEB_SEARCH_CANNOT_SORT_UNINDEXED.get();
+ LocalizableMessage message = ERR_JEB_SEARCH_CANNOT_SORT_UNINDEXED.get();
throw new DirectoryException(
ResultCode.UNAVAILABLE_CRITICAL_EXTENSION, message);
}
@@ -1269,7 +1269,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
String str = pageRequest.getCookie().toHexString();
- Message msg = ERR_JEB_INVALID_PAGED_RESULTS_COOKIE.get(str);
+ LocalizableMessage msg = ERR_JEB_INVALID_PAGED_RESULTS_COOKIE.get(str);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
msg, e);
}
@@ -1462,7 +1462,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
String str = pageRequest.getCookie().toHexString();
- Message msg = ERR_JEB_INVALID_PAGED_RESULTS_COOKIE.get(str);
+ LocalizableMessage msg = ERR_JEB_INVALID_PAGED_RESULTS_COOKIE.get(str);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
msg, e);
}
@@ -1654,7 +1654,7 @@
// Check whether the entry already exists.
if (dn2id.get(txn, entry.getName(), LockMode.DEFAULT) != null)
{
- Message message =
+ LocalizableMessage message =
ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName().toString());
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
message);
@@ -1671,7 +1671,7 @@
parentID = dn2id.get(txn, parentDN, LockMode.DEFAULT);
if (parentID == null)
{
- Message message = ERR_JEB_ADD_NO_SUCH_OBJECT.get(
+ LocalizableMessage message = ERR_JEB_ADD_NO_SUCH_OBJECT.get(
entry.getName().toString());
DN matchedDN = getMatchedDN(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
@@ -1685,7 +1685,7 @@
if (!dn2id.insert(txn, entry.getName(), entryID))
{
// Do not ever expect to come through here.
- Message message =
+ LocalizableMessage message =
ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName().toString());
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
message);
@@ -1695,7 +1695,7 @@
if (!dn2uri.addEntry(txn, entry))
{
// Do not ever expect to come through here.
- Message message =
+ LocalizableMessage message =
ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName().toString());
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
message);
@@ -1705,7 +1705,7 @@
if (!id2entry.insert(txn, entryID, entry))
{
// Do not ever expect to come through here.
- Message message =
+ LocalizableMessage message =
ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName().toString());
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
message);
@@ -1734,7 +1734,7 @@
EntryID nodeID = dn2id.get(txn, dn, LockMode.DEFAULT);
if (nodeID == null)
{
- Message msg =
+ LocalizableMessage msg =
ERR_JEB_MISSING_DN2ID_RECORD.get(dn.toNormalizedString());
throw new JebException(msg);
}
@@ -1784,7 +1784,7 @@
{
msg = stackTraceToSingleLineString(e);
}
- Message message = ERR_JEB_UNCHECKED_EXCEPTION.get(msg);
+ LocalizableMessage message = ERR_JEB_UNCHECKED_EXCEPTION.get(msg);
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
@@ -1881,7 +1881,7 @@
{
// The subtree delete control was not specified and
// the target entry is not a leaf.
- Message message =
+ LocalizableMessage message =
ERR_JEB_DELETE_NOT_ALLOWED_ON_NONLEAF.get(entryDN.toString());
throw new DirectoryException(ResultCode.NOT_ALLOWED_ON_NONLEAF,
message);
@@ -1914,7 +1914,7 @@
if (!pluginResult.continueProcessing())
{
- Message message =
+ LocalizableMessage message =
ERR_JEB_DELETE_ABORTED_BY_SUBORDINATE_PLUGIN.get(
JebFormat.dnFromDNKey(key.getData(), 0, 0, getBaseDN()).
toString());
@@ -1996,7 +1996,7 @@
{
msg = stackTraceToSingleLineString(e);
}
- Message message = ERR_JEB_UNCHECKED_EXCEPTION.get(msg);
+ LocalizableMessage message = ERR_JEB_UNCHECKED_EXCEPTION.get(msg);
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
@@ -2024,7 +2024,7 @@
status = dn2id.read(txn, leafDNKey, value, LockMode.RMW);
if (status != OperationStatus.SUCCESS)
{
- Message message =
+ LocalizableMessage message =
ERR_JEB_DELETE_NO_SUCH_OBJECT.get(leafDNKey.toString());
DN matchedDN = getMatchedDN(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
@@ -2037,7 +2037,7 @@
if (dn2id.delete(txn, leafDNKey) != OperationStatus.SUCCESS)
{
// Do not expect to ever come through here.
- Message message = ERR_JEB_DELETE_NO_SUCH_OBJECT.get(leafDNKey.toString());
+ LocalizableMessage message = ERR_JEB_DELETE_NO_SUCH_OBJECT.get(leafDNKey.toString());
DN matchedDN = getMatchedDN(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
message, matchedDN, null);
@@ -2047,7 +2047,7 @@
Entry entry = id2entry.get(txn, leafID, LockMode.RMW);
if (entry == null)
{
- Message msg = ERR_JEB_MISSING_ID2ENTRY_RECORD.get(leafID.toString());
+ LocalizableMessage msg = ERR_JEB_MISSING_ID2ENTRY_RECORD.get(leafID.toString());
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
msg);
}
@@ -2063,7 +2063,7 @@
// Remove from id2entry.
if (!id2entry.remove(txn, leafID))
{
- Message msg = ERR_JEB_MISSING_ID2ENTRY_RECORD.get(leafID.toString());
+ LocalizableMessage msg = ERR_JEB_MISSING_ID2ENTRY_RECORD.get(leafID.toString());
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
msg);
}
@@ -2102,7 +2102,7 @@
EntryID parentID = dn2id.get(txn, parentDN, LockMode.DEFAULT);
if (parentID == null)
{
- Message msg =
+ LocalizableMessage msg =
ERR_JEB_MISSING_DN2ID_RECORD.get(parentDN.toNormalizedString());
throw new JebException(msg);
}
@@ -2223,7 +2223,7 @@
if (entry == null)
{
// The entryID does not exist.
- Message msg = ERR_JEB_MISSING_ID2ENTRY_RECORD.get(entryID.toString());
+ LocalizableMessage msg = ERR_JEB_MISSING_ID2ENTRY_RECORD.get(entryID.toString());
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
msg);
}
@@ -2266,7 +2266,7 @@
if (entryID == null)
{
// The entry does not exist.
- Message message =
+ LocalizableMessage message =
ERR_JEB_MODIFY_NO_SUCH_OBJECT.get(newEntry.getName().toString());
DN matchedDN = getMatchedDN(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
@@ -2348,7 +2348,7 @@
{
msg = stackTraceToSingleLineString(e);
}
- Message message = ERR_JEB_UNCHECKED_EXCEPTION.get(msg);
+ LocalizableMessage message = ERR_JEB_UNCHECKED_EXCEPTION.get(msg);
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
@@ -2405,7 +2405,7 @@
if (!currentDN.equals(entry.getName()) &&
dn2id.get(txn, entry.getName(), LockMode.DEFAULT) != null)
{
- Message message = ERR_JEB_MODIFYDN_ALREADY_EXISTS.get(
+ LocalizableMessage message = ERR_JEB_MODIFYDN_ALREADY_EXISTS.get(
entry.getName().toString());
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
message);
@@ -2417,7 +2417,7 @@
// Check for referral entries above the target entry.
dn2uri.targetEntryReferrals(currentDN, null);
- Message message =
+ LocalizableMessage message =
ERR_JEB_MODIFYDN_NO_SUCH_OBJECT.get(currentDN.toString());
DN matchedDN = getMatchedDN(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
@@ -2427,7 +2427,7 @@
Entry oldApexEntry = id2entry.get(txn, oldApexID, LockMode.DEFAULT);
if (oldApexEntry == null)
{
- Message msg = ERR_JEB_MISSING_ID2ENTRY_RECORD.get(oldApexID.toString());
+ LocalizableMessage msg = ERR_JEB_MISSING_ID2ENTRY_RECORD.get(oldApexID.toString());
throw new DirectoryException(
DirectoryServer.getServerErrorResultCode(), msg);
}
@@ -2448,7 +2448,7 @@
EntryID newSuperiorID = dn2id.get(txn, newSuperiorDN, LockMode.DEFAULT);
if (newSuperiorID == null)
{
- Message msg =
+ LocalizableMessage msg =
ERR_JEB_NEW_SUPERIOR_NO_SUCH_OBJECT.get(
newSuperiorDN.toString());
DN matchedDN = getMatchedDN(baseDN);
@@ -2631,7 +2631,7 @@
{
msg = stackTraceToSingleLineString(e);
}
- Message message = ERR_JEB_UNCHECKED_EXCEPTION.get(msg);
+ LocalizableMessage message = ERR_JEB_UNCHECKED_EXCEPTION.get(msg);
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
@@ -2666,7 +2666,7 @@
{
if (!dn2id.insert(txn, newEntry.getName(), newID))
{
- Message message = ERR_JEB_MODIFYDN_ALREADY_EXISTS.get(
+ LocalizableMessage message = ERR_JEB_MODIFYDN_ALREADY_EXISTS.get(
newEntry.getName().toString());
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
message);
@@ -2808,7 +2808,7 @@
if (!pluginResult.continueProcessing())
{
- Message message = ERR_JEB_MODIFYDN_ABORTED_BY_SUBORDINATE_PLUGIN.get(
+ LocalizableMessage message = ERR_JEB_MODIFYDN_ABORTED_BY_SUBORDINATE_PLUGIN.get(
oldDN.toString(), newDN.toString());
throw new DirectoryException(
DirectoryServer.getServerErrorResultCode(), message);
@@ -2816,11 +2816,11 @@
if (! modifications.isEmpty())
{
- MessageBuilder invalidReason = new MessageBuilder();
+ LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder();
if (! newEntry.conformsToSchema(null, false, false, false,
invalidReason))
{
- Message message =
+ LocalizableMessage message =
ERR_JEB_MODIFYDN_ABORTED_BY_SUBORDINATE_SCHEMA_ERROR.get(
oldDN.toString(),
newDN.toString(),
@@ -3517,7 +3517,7 @@
{
msg = stackTraceToSingleLineString(e);
}
- Message message = ERR_JEB_UNCHECKED_EXCEPTION.get(msg);
+ LocalizableMessage message = ERR_JEB_UNCHECKED_EXCEPTION.get(msg);
throw new JebException(message, e);
}
}
@@ -3576,7 +3576,7 @@
*/
@Override
public boolean isConfigurationChangeAcceptable(
- LocalDBBackendCfg cfg, List<Message> unacceptableReasons)
+ LocalDBBackendCfg cfg, List<LocalizableMessage> unacceptableReasons)
{
// This is always true because only all config attributes used
// by the entry container should be validated by the admin framework.
@@ -3590,7 +3590,7 @@
public ConfigChangeResult applyConfigurationChange(LocalDBBackendCfg cfg)
{
boolean adminActionRequired = false;
- ArrayList<Message> messages = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
exclusiveLock.lock();
try
@@ -3629,7 +3629,7 @@
if (id2children.setIndexEntryLimit(cfg.getIndexEntryLimit()))
{
adminActionRequired = true;
- Message message = NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD
+ LocalizableMessage message = NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD
.get(id2children.getName());
messages.add(message);
}
@@ -3637,7 +3637,7 @@
if (id2subtree.setIndexEntryLimit(cfg.getIndexEntryLimit()))
{
adminActionRequired = true;
- Message message = NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD
+ LocalizableMessage message = NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD
.get(id2subtree.getName());
messages.add(message);
}
@@ -3651,7 +3651,7 @@
}
catch (DatabaseException e)
{
- messages.add(Message.raw(stackTraceToSingleLineString(e)));
+ messages.add(LocalizableMessage.raw(stackTraceToSingleLineString(e)));
return new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(),
false, messages);
}
@@ -3934,7 +3934,7 @@
// Check for referral entries above the base entry.
dn2uri.targetEntryReferrals(baseDN, searchScope);
- Message message = ERR_JEB_SEARCH_NO_SUCH_OBJECT.get(baseDN.toString());
+ LocalizableMessage message = ERR_JEB_SEARCH_NO_SUCH_OBJECT.get(baseDN.toString());
DN matchedDN = getMatchedDN(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
message, matchedDN, null);
--
Gitblit v1.10.0