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/protocols/LDIFConnectionHandler.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java b/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
index 841fd33..b4083c1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols;
@@ -34,8 +35,8 @@
import java.util.LinkedHashMap;
import java.util.List;
-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.ConfigurationChangeListener;
import org.opends.server.admin.std.server.ConnectionHandlerCfg;
import org.opends.server.admin.std.server.LDIFConnectionHandlerCfg;
@@ -179,7 +180,7 @@
* {@inheritDoc}
*/
@Override()
- public void finalizeConnectionHandler(Message finalizeReason)
+ public void finalizeConnectionHandler(LocalizableMessage finalizeReason)
{
stopRequested = true;
@@ -414,7 +415,7 @@
errorEncountered = true;
if (le.canContinueReading())
{
- Message m =
+ LocalizableMessage m =
ERR_LDIF_CONNHANDLER_CANNOT_READ_CHANGE_RECORD_NONFATAL.get(
le.getMessageObject());
writer.writeComment(m, 78);
@@ -422,7 +423,7 @@
}
else
{
- Message m =
+ LocalizableMessage m =
ERR_LDIF_CONNHANDLER_CANNOT_READ_CHANGE_RECORD_FATAL.get(
le.getMessageObject());
writer.writeComment(m, 78);
@@ -461,7 +462,7 @@
if (operation == null)
{
- Message m = INFO_LDIF_CONNHANDLER_UNKNOWN_CHANGETYPE.get(
+ LocalizableMessage m = INFO_LDIF_CONNHANDLER_UNKNOWN_CHANGETYPE.get(
changeRecord.getChangeOperationType().getLDIFChangeType());
writer.writeComment(m, 78);
}
@@ -473,12 +474,12 @@
operation.getResultCode().toString());
}
- Message m = INFO_LDIF_CONNHANDLER_RESULT_CODE.get(
+ LocalizableMessage m = INFO_LDIF_CONNHANDLER_RESULT_CODE.get(
operation.getResultCode().getIntValue(),
operation.getResultCode().toString());
writer.writeComment(m, 78);
- MessageBuilder errorMessage = operation.getErrorMessage();
+ LocalizableMessageBuilder errorMessage = operation.getErrorMessage();
if ((errorMessage != null) && (errorMessage.length() > 0))
{
m = INFO_LDIF_CONNHANDLER_ERROR_MESSAGE.get(errorMessage);
@@ -514,7 +515,7 @@
}
fullyProcessed = false;
- Message m = ERR_LDIF_CONNHANDLER_IO_ERROR.get(inputPath,
+ LocalizableMessage m = ERR_LDIF_CONNHANDLER_IO_ERROR.get(inputPath,
getExceptionMessage(ioe));
logError(m);
DirectoryConfig.sendAlertNotification(this,
@@ -573,7 +574,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message m = ERR_LDIF_CONNHANDLER_CANNOT_RENAME.get(inputPath,
+ LocalizableMessage m = ERR_LDIF_CONNHANDLER_CANNOT_RENAME.get(inputPath,
renamedPath, getExceptionMessage(e));
logError(m);
DirectoryConfig.sendAlertNotification(this,
@@ -598,7 +599,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message m = ERR_LDIF_CONNHANDLER_CANNOT_DELETE.get(inputPath,
+ LocalizableMessage m = ERR_LDIF_CONNHANDLER_CANNOT_DELETE.get(inputPath,
getExceptionMessage(e));
logError(m);
DirectoryConfig.sendAlertNotification(this,
@@ -629,7 +630,7 @@
*/
@Override()
public boolean isConfigurationAcceptable(ConnectionHandlerCfg configuration,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
LDIFConnectionHandlerCfg cfg = (LDIFConnectionHandlerCfg) configuration;
return isConfigurationChangeAcceptable(cfg, unacceptableReasons);
@@ -642,7 +643,7 @@
*/
public boolean isConfigurationChangeAcceptable(
LDIFConnectionHandlerCfg configuration,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
// The configuration should always be acceptable.
return true;
--
Gitblit v1.10.0