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/jmx/JmxClientConnection.java | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
index 9481a04..845608d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
@@ -34,8 +34,8 @@
import javax.management.NotificationListener;
import javax.management.remote.JMXConnectionNotification;
-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.*;
import org.opends.server.core.*;
import org.opends.server.core.networkgroups.NetworkGroup;
@@ -427,8 +427,8 @@
// Check if we have enough privilege
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- Message message = ERR_JMX_ADD_INSUFFICIENT_PRIVILEGES.get();
- addOperation.setErrorMessage(new MessageBuilder(message));
+ LocalizableMessage message = ERR_JMX_ADD_INSUFFICIENT_PRIVILEGES.get();
+ addOperation.setErrorMessage(new LocalizableMessageBuilder(message));
addOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -470,8 +470,8 @@
// Check if we have enough privilege
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- Message message = ERR_JMX_ADD_INSUFFICIENT_PRIVILEGES.get();
- addOperation.setErrorMessage(new MessageBuilder(message));
+ LocalizableMessage message = ERR_JMX_ADD_INSUFFICIENT_PRIVILEGES.get();
+ addOperation.setErrorMessage(new LocalizableMessageBuilder(message));
addOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -500,8 +500,8 @@
// Check if we have enough privilege
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- Message message = ERR_JMX_DELETE_INSUFFICIENT_PRIVILEGES.get();
- deleteOperation.setErrorMessage(new MessageBuilder(message));
+ LocalizableMessage message = ERR_JMX_DELETE_INSUFFICIENT_PRIVILEGES.get();
+ deleteOperation.setErrorMessage(new LocalizableMessageBuilder(message));
deleteOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -534,8 +534,8 @@
// Check if we have enough privilege
if (! hasPrivilege(Privilege.JMX_READ, null))
{
- Message message = ERR_JMX_SEARCH_INSUFFICIENT_PRIVILEGES.get();
- compareOperation.setErrorMessage(new MessageBuilder(message));
+ LocalizableMessage message = ERR_JMX_SEARCH_INSUFFICIENT_PRIVILEGES.get();
+ compareOperation.setErrorMessage(new LocalizableMessageBuilder(message));
compareOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -564,8 +564,8 @@
// Check if we have enough privilege
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- Message message = ERR_JMX_DELETE_INSUFFICIENT_PRIVILEGES.get();
- deleteOperation.setErrorMessage(new MessageBuilder(message));
+ LocalizableMessage message = ERR_JMX_DELETE_INSUFFICIENT_PRIVILEGES.get();
+ deleteOperation.setErrorMessage(new LocalizableMessageBuilder(message));
deleteOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -621,8 +621,8 @@
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- Message message = ERR_JMX_MODIFY_INSUFFICIENT_PRIVILEGES.get();
- modifyOperation.setErrorMessage(new MessageBuilder(message));
+ LocalizableMessage message = ERR_JMX_MODIFY_INSUFFICIENT_PRIVILEGES.get();
+ modifyOperation.setErrorMessage(new LocalizableMessageBuilder(message));
modifyOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -655,8 +655,8 @@
modifications);
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- Message message = ERR_JMX_MODIFY_INSUFFICIENT_PRIVILEGES.get();
- modifyOperation.setErrorMessage(new MessageBuilder(message));
+ LocalizableMessage message = ERR_JMX_MODIFY_INSUFFICIENT_PRIVILEGES.get();
+ modifyOperation.setErrorMessage(new LocalizableMessageBuilder(message));
modifyOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -712,8 +712,8 @@
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- Message message = ERR_JMX_MODDN_INSUFFICIENT_PRIVILEGES.get();
- modifyDNOperation.setErrorMessage(new MessageBuilder(message));
+ LocalizableMessage message = ERR_JMX_MODDN_INSUFFICIENT_PRIVILEGES.get();
+ modifyDNOperation.setErrorMessage(new LocalizableMessageBuilder(message));
modifyDNOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -751,8 +751,8 @@
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- Message message = ERR_JMX_MODDN_INSUFFICIENT_PRIVILEGES.get();
- modifyDNOperation.setErrorMessage(new MessageBuilder(message));
+ LocalizableMessage message = ERR_JMX_MODDN_INSUFFICIENT_PRIVILEGES.get();
+ modifyDNOperation.setErrorMessage(new LocalizableMessageBuilder(message));
modifyDNOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -816,8 +816,8 @@
if (! hasPrivilege(Privilege.JMX_READ, null))
{
- Message message = ERR_JMX_SEARCH_INSUFFICIENT_PRIVILEGES.get();
- searchOperation.setErrorMessage(new MessageBuilder(message));
+ LocalizableMessage message = ERR_JMX_SEARCH_INSUFFICIENT_PRIVILEGES.get();
+ searchOperation.setErrorMessage(new LocalizableMessageBuilder(message));
searchOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -955,7 +955,7 @@
@Override
public void disconnect(DisconnectReason disconnectReason,
boolean sendNotification,
- Message message)
+ LocalizableMessage message)
{
// we are already performing a disconnect
if (disconnectStarted)
@@ -1073,7 +1073,7 @@
// Jmx operations cannot be cancelled.
// TODO: i18n
return new CancelResult(ResultCode.CANNOT_CANCEL,
- Message.raw("Jmx operations cannot be cancelled"));
+ LocalizableMessage.raw("Jmx operations cannot be cancelled"));
}
--
Gitblit v1.10.0