From 80c58327faaa4873369f6bb949e62792c2f708e0 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.
---
opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java b/opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
index ad07f71..5e16790 100644
--- a/opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
+++ b/opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
@@ -25,12 +25,13 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.extensions;
+import org.opends.messages.Message;
-import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.ErrorLogger.logError;
-import static org.opends.server.messages.ExtensionsMessages.*;
+import static org.opends.messages.ExtensionMessages.*;
+
import java.util.ArrayList;
import java.util.HashSet;
@@ -47,8 +48,8 @@
import org.opends.server.types.AccountStatusNotificationType;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-import org.opends.server.types.ErrorLogCategory;
-import org.opends.server.types.ErrorLogSeverity;
+
+
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
@@ -71,15 +72,15 @@
* The set of names for the account status notification types that may be
* logged by this notification handler.
*/
- private static final HashSet<String> NOTIFICATION_TYPE_NAMES =
- new HashSet<String>();
+ private static final HashSet<Message> NOTIFICATION_TYPE_NAMES =
+ new HashSet<Message>();
static
{
for (AccountStatusNotificationType t :
AccountStatusNotificationType.values())
{
- NOTIFICATION_TYPE_NAMES.add(t.getNotificationTypeName());
+ NOTIFICATION_TYPE_NAMES.add(t.getNotificationName());
}
}
@@ -114,15 +115,15 @@
* {@inheritDoc}
*/
public void handleStatusNotification(AccountStatusNotificationType
- notificationType,
- DN userDN, int messageID, String message)
+ notificationType,
+ DN userDN, Message message)
{
if (notificationTypes.contains(notificationType))
{
- int msgID = MSGID_ERRORLOG_ACCTNOTHANDLER_NOTIFICATION;
- logError(ErrorLogCategory.PASSWORD_POLICY, ErrorLogSeverity.NOTICE,
- msgID, notificationType.getNotificationTypeName(),
- String.valueOf(userDN), messageID, message);
+ logError(NOTE_ERRORLOG_ACCTNOTHANDLER_NOTIFICATION.get(
+ notificationType.getNotificationName(),
+ String.valueOf(userDN),
+ message.getDescriptor().getId(), message));
}
}
@@ -134,7 +135,7 @@
@Override()
public boolean isConfigurationAcceptable(
AccountStatusNotificationHandlerCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
ErrorLogAccountStatusNotificationHandlerCfg config =
(ErrorLogAccountStatusNotificationHandlerCfg) configuration;
@@ -148,7 +149,7 @@
*/
public boolean isConfigurationChangeAcceptable(
ErrorLogAccountStatusNotificationHandlerCfg configuration,
- List<String> unacceptableReasons
+ List<Message> unacceptableReasons
)
{
// Make sure that we can process the defined notification handler.
@@ -199,7 +200,7 @@
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
ConfigChangeResult changeResult = new ConfigChangeResult(
resultCode, adminActionRequired, messages
);
@@ -258,8 +259,9 @@
* Gets the OpenDS notification type object that corresponds to the
* configuration counterpart.
*
- * @param notificationType The configuration notification type for which
- * to retrieve the OpenDS notification type.
+ * @param configNotificationType The configuration notification type for
+ * which to retrieve the OpenDS notification
+ * type.
*/
private AccountStatusNotificationType getNotificationType(
ErrorLogAccountStatusNotificationHandlerCfgDefn.
--
Gitblit v1.10.0