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/extensions/FileSystemEntryCache.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
index f79625e..d94456d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
@@ -56,8 +56,8 @@
import com.sleepycat.je.StatsConfig;
import com.sleepycat.je.config.ConfigParam;
import com.sleepycat.je.config.EnvironmentParams;
-import org.opends.messages.Message;
-import org.opends.messages.MessageBuilder;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.api.Backend;
import org.opends.server.api.EntryCache;
import org.opends.server.admin.std.server.EntryCacheCfg;
@@ -220,22 +220,22 @@
// Read and apply configuration.
boolean applyChanges = true;
- ArrayList<Message> errorMessages = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> errorMessages = new ArrayList<LocalizableMessage>();
EntryCacheCommon.ConfigErrorHandler errorHandler =
EntryCacheCommon.getConfigErrorHandler (
EntryCacheCommon.ConfigPhase.PHASE_INIT, null, errorMessages
);
if (!processEntryCacheConfig(configuration, applyChanges, errorHandler)) {
- MessageBuilder buffer = new MessageBuilder();
+ LocalizableMessageBuilder buffer = new LocalizableMessageBuilder();
if (!errorMessages.isEmpty()) {
- Iterator<Message> iterator = errorMessages.iterator();
+ Iterator<LocalizableMessage> iterator = errorMessages.iterator();
buffer.append(iterator.next());
while (iterator.hasNext()) {
buffer.append(". ");
buffer.append(iterator.next());
}
}
- Message message = ERR_FSCACHE_CANNOT_INITIALIZE.get(buffer.toString());
+ LocalizableMessage message = ERR_FSCACHE_CANNOT_INITIALIZE.get(buffer.toString());
throw new ConfigException(message);
}
@@ -273,7 +273,7 @@
// Not having any home directory for the cache db environment is a
// fatal error as we are unable to continue any further without it.
- Message message =
+ LocalizableMessage message =
ERR_FSCACHE_HOMELESS.get();
throw new InitializationException(message, e);
}
@@ -334,7 +334,7 @@
INDEXKEY.getBytes("UTF-8"));
// Persistent state report.
- Message message = NOTE_FSCACHE_RESTORE.get();
+ LocalizableMessage message = NOTE_FSCACHE_RESTORE.get();
logError(message);
if (OperationStatus.SUCCESS ==
@@ -422,7 +422,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message =
+ LocalizableMessage message =
ERR_FSCACHE_CANNOT_INITIALIZE.get(
(e.getCause() != null ? e.getCause().getMessage() :
stackTraceToSingleLineString(e)));
@@ -457,7 +457,7 @@
DatabaseEntry indexData = new DatabaseEntry();
// Persistent state save report.
- Message message = NOTE_FSCACHE_SAVE.get();
+ LocalizableMessage message = NOTE_FSCACHE_SAVE.get();
logError(message);
//This line causes an unchecked call error if the SuppressWarnings
//annotation is removed at the beginning of this method.
@@ -478,7 +478,7 @@
}
// Persistent state save report.
- Message message = NOTE_FSCACHE_SAVE_REPORT.get(
+ LocalizableMessage message = NOTE_FSCACHE_SAVE_REPORT.get(
entryCacheIndex.dnMap.size());
logError(message);
}
@@ -943,7 +943,7 @@
*/
@Override()
public boolean isConfigurationAcceptable(EntryCacheCfg configuration,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
FileSystemEntryCacheCfg config = (FileSystemEntryCacheCfg) configuration;
return isConfigurationChangeAcceptable(config, unacceptableReasons);
@@ -955,7 +955,7 @@
@Override
public boolean isConfigurationChangeAcceptable(
FileSystemEntryCacheCfg configuration,
- List<Message> unacceptableReasons
+ List<LocalizableMessage> unacceptableReasons
)
{
boolean applyChanges = false;
@@ -979,7 +979,7 @@
)
{
boolean applyChanges = true;
- ArrayList<Message> errorMessages = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> errorMessages = new ArrayList<LocalizableMessage>();
EntryCacheCommon.ConfigErrorHandler errorHandler =
EntryCacheCommon.getConfigErrorHandler (
EntryCacheCommon.ConfigPhase.PHASE_APPLY, null, errorMessages
@@ -1161,7 +1161,7 @@
String oldValue = oldEnvConfig.getConfigParam(param.getName());
String newValue = jePropertyValue;
if (!oldValue.equalsIgnoreCase(newValue)) {
- Message message =
+ LocalizableMessage message =
INFO_CONFIG_JE_PROPERTY_REQUIRES_RESTART.get(
jePropertyName);
errorHandler.reportError(message, true, ResultCode.SUCCESS,
@@ -1185,7 +1185,7 @@
false, DirectoryServer.getServerErrorResultCode());
} catch (Exception e) {
errorHandler.reportError(
- Message.raw(stackTraceToSingleLineString(e)),
+ LocalizableMessage.raw(stackTraceToSingleLineString(e)),
false, DirectoryServer.getServerErrorResultCode());
}
break;
@@ -1478,7 +1478,7 @@
}
} catch(Exception e) {
// Log a warning that the permissions were not set.
- Message message = WARN_FSCACHE_SET_PERMISSIONS_FAILED.get(cacheHome);
+ LocalizableMessage message = WARN_FSCACHE_SET_PERMISSIONS_FAILED.get(cacheHome);
logError(message);
}
}
--
Gitblit v1.10.0