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/replication/server/ECLServerHandler.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
index 6aa1080..8ebfc99 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
@@ -31,9 +31,7 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import org.opends.messages.Category;
-import org.opends.messages.Message;
-import org.opends.messages.Severity;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.common.MultiDomainServerState;
import org.opends.server.replication.common.ServerState;
@@ -361,7 +359,7 @@
}
catch(Exception e)
{
- Message message = Message.raw(e.getLocalizedMessage());
+ LocalizableMessage message = LocalizableMessage.raw(e.getLocalizedMessage());
throw new DirectoryException(ResultCode.OTHER, message);
}
return inECLStartMsg.getSSLEncryption();
@@ -481,7 +479,7 @@
}
catch(Exception e)
{
- abortStart(Message.raw(e.getLocalizedMessage()));
+ abortStart(LocalizableMessage.raw(e.getLocalizedMessage()));
}
finally
{
@@ -508,7 +506,7 @@
}
else if (!(msg instanceof StartECLSessionMsg))
{
- Message message = Message.raw(
+ LocalizableMessage message = LocalizableMessage.raw(
"Protocol error: StartECLSessionMsg required." + msg + " received.");
abortStart(message);
return null;
@@ -566,8 +564,7 @@
releaseCursor();
throw new DirectoryException(
ResultCode.OPERATIONS_ERROR,
- Message.raw(Category.SYNC,
- Severity.FATAL_ERROR,e.getLocalizedMessage()));
+ LocalizableMessage.raw(e.getLocalizedMessage()));
}
}
@@ -666,7 +663,7 @@
}
// startChangeNumber is greater than the potential newest change number
- throw new DirectoryException(ResultCode.SUCCESS, Message.raw(""));
+ throw new DirectoryException(ResultCode.SUCCESS, LocalizableMessage.raw(""));
}
private DBCursor<ChangeNumberIndexRecord> getCursorFrom(
@@ -678,7 +675,7 @@
if (cursor.getRecord() == null)
{
close(cursor);
- throw new ChangelogException(Message.raw("Change Number "
+ throw new ChangelogException(LocalizableMessage.raw("Change Number "
+ startChangeNumber + " is not available in the Changelog"));
}
return cursor;
@@ -718,7 +715,7 @@
// FIXME:ECL do not publish internal exception plumb to the client
throw new DirectoryException(
ResultCode.OPERATIONS_ERROR,
- Message.raw(Category.SYNC, Severity.INFORMATION,"Exception raised: " +
+ LocalizableMessage.raw("Exception raised: " +
e),
e);
}
@@ -919,8 +916,7 @@
releaseCursor();
for (DomainContext domainCtxt : domainCtxts) {
if (!domainCtxt.unRegisterHandler()) {
- logError(Message.raw(Category.SYNC, Severity.NOTICE,
- this + " shutdown() - error when unregistering handler "
+ logError(LocalizableMessage.raw( this + " shutdown() - error when unregistering handler "
+ domainCtxt.mh));
}
domainCtxt.stopServer();
@@ -1253,7 +1249,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
throw new DirectoryException(
ResultCode.OPERATIONS_ERROR,
- Message.raw(Category.SYNC, Severity.INFORMATION,"Exception raised: "),
+ LocalizableMessage.raw("Exception raised: "),
e);
}
--
Gitblit v1.10.0