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/extensions/RandomPasswordGenerator.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java b/opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
index 7d9c6a4..ba607a3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
@@ -34,7 +34,7 @@
import java.util.SortedSet;
import java.util.StringTokenizer;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.PasswordGeneratorCfg;
import org.opends.server.admin.std.server.RandomPasswordGeneratorCfg;
@@ -115,7 +115,7 @@
if (encodedCharacterSets.size() == 0)
{
- Message message =
+ LocalizableMessage message =
ERR_RANDOMPWGEN_NO_CHARSETS.get(String.valueOf(configEntryDN));
throw new ConfigException(message);
}
@@ -124,7 +124,7 @@
{
if (charsets.containsKey(s.getName()))
{
- Message message = ERR_RANDOMPWGEN_CHARSET_NAME_CONFLICT.get(
+ LocalizableMessage message = ERR_RANDOMPWGEN_CHARSET_NAME_CONFLICT.get(
String.valueOf(configEntryDN), s.getName());
throw new ConfigException(message);
}
@@ -145,7 +145,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message =
+ LocalizableMessage message =
ERR_RANDOMPWGEN_CANNOT_DETERMINE_CHARSETS.get(getExceptionMessage(e));
throw new InitializationException(message, e);
}
@@ -175,7 +175,7 @@
NamedCharacterSet charset = charsets.get(name);
if (charset == null)
{
- Message message = ERR_RANDOMPWGEN_UNKNOWN_CHARSET.get(
+ LocalizableMessage message = ERR_RANDOMPWGEN_UNKNOWN_CHARSET.get(
String.valueOf(formatString), String.valueOf(name));
throw new ConfigException(message);
}
@@ -196,7 +196,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_RANDOMPWGEN_INVALID_PWFORMAT.get(
+ LocalizableMessage message = ERR_RANDOMPWGEN_INVALID_PWFORMAT.get(
String.valueOf(formatString));
throw new ConfigException(message, e);
}
@@ -224,7 +224,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message =
+ LocalizableMessage message =
ERR_RANDOMPWGEN_CANNOT_DETERMINE_PWFORMAT.get(getExceptionMessage(e));
throw new InitializationException(message, e);
}
@@ -281,7 +281,7 @@
*/
@Override()
public boolean isConfigurationAcceptable(PasswordGeneratorCfg configuration,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
RandomPasswordGeneratorCfg config =
(RandomPasswordGeneratorCfg) configuration;
@@ -295,7 +295,7 @@
*/
public boolean isConfigurationChangeAcceptable(
RandomPasswordGeneratorCfg configuration,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
DN cfgEntryDN = configuration.dn();
@@ -309,7 +309,7 @@
SortedSet<String> currentPasSet = configuration.getPasswordCharacterSet();
if (currentPasSet.size() == 0)
{
- Message message =
+ LocalizableMessage message =
ERR_RANDOMPWGEN_NO_CHARSETS.get(String.valueOf(cfgEntryDN));
throw new ConfigException(message);
}
@@ -319,7 +319,7 @@
{
if (charsets.containsKey(s.getName()))
{
- Message message = ERR_RANDOMPWGEN_CHARSET_NAME_CONFLICT.get(
+ LocalizableMessage message = ERR_RANDOMPWGEN_CHARSET_NAME_CONFLICT.get(
String.valueOf(cfgEntryDN), s.getName());
unacceptableReasons.add(message);
return false;
@@ -342,7 +342,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_RANDOMPWGEN_CANNOT_DETERMINE_CHARSETS.get(
+ LocalizableMessage message = ERR_RANDOMPWGEN_CANNOT_DETERMINE_CHARSETS.get(
getExceptionMessage(e));
unacceptableReasons.add(message);
return false;
@@ -369,7 +369,7 @@
NamedCharacterSet charset = charsets.get(name);
if (charset == null)
{
- Message message = ERR_RANDOMPWGEN_UNKNOWN_CHARSET.get(
+ LocalizableMessage message = ERR_RANDOMPWGEN_UNKNOWN_CHARSET.get(
String.valueOf(formatString), String.valueOf(name));
unacceptableReasons.add(message);
return false;
@@ -382,7 +382,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_RANDOMPWGEN_INVALID_PWFORMAT.get(
+ LocalizableMessage message = ERR_RANDOMPWGEN_INVALID_PWFORMAT.get(
String.valueOf(formatString));
unacceptableReasons.add(message);
return false;
@@ -396,7 +396,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_RANDOMPWGEN_CANNOT_DETERMINE_PWFORMAT.get(
+ LocalizableMessage message = ERR_RANDOMPWGEN_CANNOT_DETERMINE_PWFORMAT.get(
getExceptionMessage(e));
unacceptableReasons.add(message);
return false;
@@ -417,7 +417,7 @@
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<Message> messages = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
// Get the character sets for use in generating the password. At least one
--
Gitblit v1.10.0