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/authorization/dseecompat/DNS.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/DNS.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/DNS.java
index 062b79f..765f785 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/DNS.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/DNS.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -38,7 +38,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
@@ -88,7 +88,7 @@
throws AciException
{
if (!Pattern.matches(valuesRegExGroup, expr)) {
- Message message = WARN_ACI_SYNTAX_INVALID_DNS_EXPRESSION.get(expr);
+ LocalizableMessage message = WARN_ACI_SYNTAX_INVALID_DNS_EXPRESSION.get(expr);
throw new AciException(message);
}
List<String> dns = new LinkedList<String>();
@@ -100,7 +100,7 @@
String[] hnArray=hn.split("\\.", -1);
for(int i=1, n=hnArray.length; i < n; i++) {
if(hnArray[i].equals("*")) {
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_INVALID_DNS_WILDCARD.get(expr);
throw new AciException(message);
}
@@ -132,14 +132,14 @@
{
dns.add(canonicalName);
- Message message =
+ LocalizableMessage message =
WARN_ACI_LOCALHOST_DOESNT_MATCH_CANONICAL_VALUE.
get(expr, hn, canonicalName);
logError(message);
}
else
{
- Message message =
+ LocalizableMessage message =
WARN_ACI_HOSTNAME_DOESNT_MATCH_CANONICAL_VALUE.
get(expr, hn, addr.getHostAddress(),
addr.getCanonicalHostName());
@@ -155,7 +155,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = WARN_ACI_ERROR_CHECKING_CANONICAL_HOSTNAME.
+ LocalizableMessage message = WARN_ACI_ERROR_CHECKING_CANONICAL_HOSTNAME.
get(hn, expr, getExceptionMessage(e));
logError(message);
}
--
Gitblit v1.10.0