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/schema/CollationMatchingRuleFactory.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java b/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
index d2a4d5b..31993b6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
@@ -42,7 +42,7 @@
import java.text.Collator;
import java.util.*;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.
CollationMatchingRuleCfgDefn.MatchingRuleType;
@@ -249,7 +249,7 @@
String languageTag = mapper.getLanguageTag();
if (nOID == null || languageTag == null)
{
- Message msg =
+ LocalizableMessage msg =
WARN_ATTR_INVALID_COLLATION_MATCHING_RULE_FORMAT
.get(collation);
logError(msg);
@@ -269,7 +269,7 @@
else
{
// This locale is not supported by JVM.
- Message msg =
+ LocalizableMessage msg =
WARN_ATTR_INVALID_COLLATION_MATCHING_RULE_LOCALE.get(
collation, configuration.dn().toNormalizedString(),
languageTag);
@@ -308,7 +308,7 @@
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<Message> messages = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
if (!configuration.isEnabled()
|| currentConfig.isEnabled() != configuration.isEnabled())
@@ -357,7 +357,7 @@
}
catch (DirectoryException de)
{
- Message message =
+ LocalizableMessage message =
WARN_CONFIG_SCHEMA_MR_CONFLICTING_MR.get(String
.valueOf(configuration.dn()), de.getMessageObject());
adminActionRequired = true;
@@ -376,7 +376,7 @@
@Override
public boolean isConfigurationChangeAcceptable(
CollationMatchingRuleCfg configuration,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
boolean configAcceptable = true;
@@ -401,7 +401,7 @@
if (nOID == null || languageTag == null)
{
configAcceptable = false;
- Message msg =
+ LocalizableMessage msg =
WARN_ATTR_INVALID_COLLATION_MATCHING_RULE_FORMAT
.get(collation);
unacceptableReasons.add(msg);
@@ -411,7 +411,7 @@
Locale locale = getLocale(languageTag);
if (locale == null)
{
- Message msg =
+ LocalizableMessage msg =
WARN_ATTR_INVALID_COLLATION_MATCHING_RULE_LOCALE.get(
collation, configuration.dn().toNormalizedString(),
languageTag);
@@ -1106,7 +1106,7 @@
// If there were no asterisks, then this isn't a substring filter.
if (asteriskPositions.isEmpty())
{
- Message message =
+ LocalizableMessage message =
ERR_SEARCH_FILTER_SUBSTRING_NO_ASTERISKS.get(filterString,
0, endPos);
throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
--
Gitblit v1.10.0