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/Aci.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/Aci.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/Aci.java
index 5b04e08..0d5607c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/Aci.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/Aci.java
@@ -33,7 +33,7 @@
import java.util.Set;
import java.util.regex.Pattern;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.types.DN;
@@ -369,7 +369,7 @@
//Perform a quick pattern check against the string to catch any
//obvious syntax errors.
if (!Pattern.matches(aciRegex, input)) {
- Message message = WARN_ACI_SYNTAX_GENERAL_PARSE_FAILED.get(input);
+ LocalizableMessage message = WARN_ACI_SYNTAX_GENERAL_PARSE_FAILED.get(input);
throw new AciException(message);
}
//Decode the body first.
@@ -546,7 +546,7 @@
*
* @throws AciException If the specified expression string is invalid.
*/
- public static Set<String> decodeOID(String expr, Message msg)
+ public static Set<String> decodeOID(String expr, LocalizableMessage msg)
throws AciException {
Set<String> OIDs = new HashSet<String>();
//Quick check to see if the expression is valid.
@@ -586,13 +586,13 @@
while ((pos < length) && ((c = oidStr.charAt(pos++)) != ' ')) {
if (c == '.') {
if (lastWasPeriod) {
- Message message = WARN_ACI_SYNTAX_DOUBLE_PERIOD_IN_NUMERIC_OID.get(
+ LocalizableMessage message = WARN_ACI_SYNTAX_DOUBLE_PERIOD_IN_NUMERIC_OID.get(
oidStr, pos-1);
throw new AciException(message);
}
lastWasPeriod = true;
} else if (! isDigit(c)) {
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_ILLEGAL_CHAR_IN_NUMERIC_OID.get(oidStr, c, pos-1);
throw new AciException(message);
} else
--
Gitblit v1.10.0