From cfc513043c5830b5a967733066068c7097b42e3c Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.
---
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java | 71 +++++++++++++++--------------------
1 files changed, 30 insertions(+), 41 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
index ddb9022..c3e5d43 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.protocols.jmx;
+import org.opends.messages.Message;
@@ -70,8 +71,9 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
-import static org.opends.server.messages.ProtocolMessages.*;
-import static org.opends.server.messages.MessageHandler.getMessage;
+import static org.opends.messages.ProtocolMessages.*;
+
+import org.opends.messages.MessageBuilder;
/**
@@ -149,7 +151,7 @@
disconnect(
DisconnectReason.ADMIN_LIMIT_EXCEEDED,
true,
- MSGID_LDAP_CONNHANDLER_REJECTED_BY_SERVER);
+ ERR_LDAP_CONNHANDLER_REJECTED_BY_SERVER.get());
}
operationList = new LinkedList<AbstractOperation>();
@@ -211,7 +213,7 @@
//
// Ok, we can perform the unbind: call finalize
- disconnect(DisconnectReason.CLIENT_DISCONNECT, false, null, -1);
+ disconnect(DisconnectReason.CLIENT_DISCONNECT, false, null);
}
@@ -487,9 +489,8 @@
// Check if we have enough privilege
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- int msgID = MSGID_JMX_ADD_INSUFFICIENT_PRIVILEGES;
- String message = getMessage(msgID);
- addOperation.setErrorMessage(new StringBuilder(message));
+ Message message = ERR_JMX_ADD_INSUFFICIENT_PRIVILEGES.get();
+ addOperation.setErrorMessage(new MessageBuilder(message));
addOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -531,9 +532,8 @@
// Check if we have enough privilege
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- int msgID = MSGID_JMX_ADD_INSUFFICIENT_PRIVILEGES;
- String message = getMessage(msgID);
- addOperation.setErrorMessage(new StringBuilder(message));
+ Message message = ERR_JMX_ADD_INSUFFICIENT_PRIVILEGES.get();
+ addOperation.setErrorMessage(new MessageBuilder(message));
addOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -562,9 +562,8 @@
// Check if we have enough privilege
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- int msgID = MSGID_JMX_DELETE_INSUFFICIENT_PRIVILEGES;
- String message = getMessage(msgID);
- deleteOperation.setErrorMessage(new StringBuilder(message));
+ Message message = ERR_JMX_DELETE_INSUFFICIENT_PRIVILEGES.get();
+ deleteOperation.setErrorMessage(new MessageBuilder(message));
deleteOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -597,9 +596,8 @@
// Check if we have enough privilege
if (! hasPrivilege(Privilege.JMX_READ, null))
{
- int msgID = MSGID_JMX_SEARCH_INSUFFICIENT_PRIVILEGES;
- String message = getMessage(msgID);
- compareOperation.setErrorMessage(new StringBuilder(message));
+ Message message = ERR_JMX_SEARCH_INSUFFICIENT_PRIVILEGES.get();
+ compareOperation.setErrorMessage(new MessageBuilder(message));
compareOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -628,9 +626,8 @@
// Check if we have enough privilege
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- int msgID = MSGID_JMX_DELETE_INSUFFICIENT_PRIVILEGES;
- String message = getMessage(msgID);
- deleteOperation.setErrorMessage(new StringBuilder(message));
+ Message message = ERR_JMX_DELETE_INSUFFICIENT_PRIVILEGES.get();
+ deleteOperation.setErrorMessage(new MessageBuilder(message));
deleteOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -686,9 +683,8 @@
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- int msgID = MSGID_JMX_MODIFY_INSUFFICIENT_PRIVILEGES;
- String message = getMessage(msgID);
- modifyOperation.setErrorMessage(new StringBuilder(message));
+ Message message = ERR_JMX_MODIFY_INSUFFICIENT_PRIVILEGES.get();
+ modifyOperation.setErrorMessage(new MessageBuilder(message));
modifyOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -721,9 +717,8 @@
modifications);
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- int msgID = MSGID_JMX_MODIFY_INSUFFICIENT_PRIVILEGES;
- String message = getMessage(msgID);
- modifyOperation.setErrorMessage(new StringBuilder(message));
+ Message message = ERR_JMX_MODIFY_INSUFFICIENT_PRIVILEGES.get();
+ modifyOperation.setErrorMessage(new MessageBuilder(message));
modifyOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -779,9 +774,8 @@
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- int msgID = MSGID_JMX_MODDN_INSUFFICIENT_PRIVILEGES;
- String message = getMessage(msgID);
- modifyDNOperation.setErrorMessage(new StringBuilder(message));
+ Message message = ERR_JMX_MODDN_INSUFFICIENT_PRIVILEGES.get();
+ modifyDNOperation.setErrorMessage(new MessageBuilder(message));
modifyDNOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -819,9 +813,8 @@
if (! hasPrivilege(Privilege.JMX_WRITE, null))
{
- int msgID = MSGID_JMX_MODDN_INSUFFICIENT_PRIVILEGES;
- String message = getMessage(msgID);
- modifyDNOperation.setErrorMessage(new StringBuilder(message));
+ Message message = ERR_JMX_MODDN_INSUFFICIENT_PRIVILEGES.get();
+ modifyDNOperation.setErrorMessage(new MessageBuilder(message));
modifyDNOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -885,9 +878,8 @@
if (! hasPrivilege(Privilege.JMX_READ, null))
{
- int msgID = MSGID_JMX_SEARCH_INSUFFICIENT_PRIVILEGES;
- String message = getMessage(msgID);
- searchOperation.setErrorMessage(new StringBuilder(message));
+ Message message = ERR_JMX_SEARCH_INSUFFICIENT_PRIVILEGES.get();
+ searchOperation.setErrorMessage(new MessageBuilder(message));
searchOperation.setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS) ;
}
else
@@ -1018,13 +1010,10 @@
* @param message The message to send to the client. It may be
* <CODE>null</CODE> if no notification is to be
* sent.
- * @param messageID The unique identifier associated with the message
- * to send to the client. It may be -1 if no
- * notification is to be sent.
*/
public void disconnect(DisconnectReason disconnectReason,
- boolean sendNotification, String message,
- int messageID)
+ boolean sendNotification,
+ Message message)
{
// we are already performing a disconnect
if (disconnectStarted)
@@ -1061,7 +1050,7 @@
PluginConfigManager pluginManager =
DirectoryServer.getPluginConfigManager();
pluginManager.invokePostDisconnectPlugins(this, disconnectReason,
- messageID, message);
+ message);
}
catch (Exception e)
{
@@ -1266,7 +1255,7 @@
protected void finalize()
{
super.finalize();
- disconnect(DisconnectReason.OTHER, false, null, -1);
+ disconnect(DisconnectReason.OTHER, false, null);
}
}
--
Gitblit v1.10.0