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/core/PasswordValidatorConfigManager.java | 51 +++++++++++++++++++++++----------------------------
1 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java b/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
index 3e5d3dc..810d6f1 100644
--- a/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
+++ b/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.core;
+import org.opends.messages.Message;
@@ -46,14 +47,12 @@
import org.opends.server.config.ConfigException;
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;
+import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.server.messages.ConfigMessages.*;
-import static org.opends.server.messages.MessageHandler.*;
+
import static org.opends.server.util.StaticUtils.*;
@@ -136,9 +135,7 @@
}
catch (InitializationException ie)
{
- logError(ErrorLogCategory.CONFIGURATION,
- ErrorLogSeverity.SEVERE_ERROR,
- ie.getMessage(), ie.getMessageID());
+ logError(ie.getMessageObject());
continue;
}
}
@@ -152,7 +149,7 @@
*/
public boolean isConfigurationAddAcceptable(
PasswordValidatorCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
if (configuration.isEnabled())
{
@@ -165,7 +162,7 @@
}
catch (InitializationException ie)
{
- unacceptableReasons.add(ie.getMessage());
+ unacceptableReasons.add(ie.getMessageObject());
return false;
}
}
@@ -184,7 +181,7 @@
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
configuration.addChangeListener(this);
@@ -210,7 +207,7 @@
resultCode = DirectoryServer.getServerErrorResultCode();
}
- messages.add(ie.getMessage());
+ messages.add(ie.getMessageObject());
}
if (resultCode == ResultCode.SUCCESS)
@@ -230,7 +227,7 @@
*/
public boolean isConfigurationDeleteAcceptable(
PasswordValidatorCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
// FIXME -- We should try to perform some check to determine whether the
// password validator is in use.
@@ -247,7 +244,7 @@
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
DirectoryServer.deregisterPasswordValidator(configuration.dn());
@@ -268,7 +265,7 @@
*/
public boolean isConfigurationChangeAcceptable(
PasswordValidatorCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
if (configuration.isEnabled())
{
@@ -281,7 +278,7 @@
}
catch (InitializationException ie)
{
- unacceptableReasons.add(ie.getMessage());
+ unacceptableReasons.add(ie.getMessageObject());
return false;
}
}
@@ -300,7 +297,7 @@
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
// Get the existing validator if it's already enabled.
@@ -357,7 +354,7 @@
resultCode = DirectoryServer.getServerErrorResultCode();
}
- messages.add(ie.getMessage());
+ messages.add(ie.getMessageObject());
}
if (resultCode == ResultCode.SUCCESS)
@@ -420,7 +417,7 @@
PasswordValidatorCfg.class,
List.class);
- List<String> unacceptableReasons = new ArrayList<String>();
+ List<Message> unacceptableReasons = new ArrayList<Message>();
Boolean acceptable = (Boolean) method.invoke(validator, configuration,
unacceptableReasons);
if (! acceptable)
@@ -428,7 +425,7 @@
StringBuilder buffer = new StringBuilder();
if (! unacceptableReasons.isEmpty())
{
- Iterator<String> iterator = unacceptableReasons.iterator();
+ Iterator<Message> iterator = unacceptableReasons.iterator();
buffer.append(iterator.next());
while (iterator.hasNext())
{
@@ -437,10 +434,9 @@
}
}
- int msgID = MSGID_CONFIG_PWVALIDATOR_CONFIG_NOT_ACCEPTABLE;
- String message = getMessage(msgID, String.valueOf(configuration.dn()),
- buffer.toString());
- throw new InitializationException(msgID, message);
+ Message message = ERR_CONFIG_PWVALIDATOR_CONFIG_NOT_ACCEPTABLE.get(
+ String.valueOf(configuration.dn()), buffer.toString());
+ throw new InitializationException(message);
}
}
@@ -448,11 +444,10 @@
}
catch (Exception e)
{
- int msgID = MSGID_CONFIG_PWVALIDATOR_INITIALIZATION_FAILED;
- String message = getMessage(msgID, className,
- String.valueOf(configuration.dn()),
- stackTraceToSingleLineString(e));
- throw new InitializationException(msgID, message, e);
+ Message message = ERR_CONFIG_PWVALIDATOR_INITIALIZATION_FAILED.
+ get(className, String.valueOf(configuration.dn()),
+ stackTraceToSingleLineString(e));
+ throw new InitializationException(message, e);
}
}
}
--
Gitblit v1.10.0