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/BindRule.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/BindRule.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/BindRule.java
index 60cdc9c..a155266 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/BindRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/BindRule.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;
@@ -33,7 +33,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
/**
* This class represents a single bind rule of an ACI permission-bind rule
@@ -215,7 +215,7 @@
* Raise an exception otherwise.
*/
if (numOpen > numClose) {
- Message message =
+ LocalizableMessage message =
ERR_ACI_SYNTAX_BIND_RULE_MISSING_CLOSE_PAREN.get(input);
throw new AciException(message);
}
@@ -266,7 +266,7 @@
}
}
else {
- Message message =
+ LocalizableMessage message =
ERR_ACI_SYNTAX_INVALID_BIND_RULE_SYNTAX.get(input);
throw new AciException(message);
}
@@ -293,7 +293,7 @@
keyword = EnumBindRuleKeyword.createBindRuleKeyword(keywordStr);
if (keyword == null)
{
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_INVALID_BIND_RULE_KEYWORD.get(keywordStr);
throw new AciException(message);
}
@@ -301,14 +301,14 @@
// Get the operator
operator = EnumBindRuleType.createBindruleOperand(operatorStr);
if (operator == null) {
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_INVALID_BIND_RULE_OPERATOR.get(operatorStr);
throw new AciException(message);
}
//expression can't be null
if (expression == null) {
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_MISSING_BIND_RULE_EXPRESSION.get(operatorStr);
throw new AciException(message);
}
@@ -344,7 +344,7 @@
if ((operand == null)
|| ((operand != EnumBooleanTypes.AND_BOOLEAN_TYPE) &&
(operand != EnumBooleanTypes.OR_BOOLEAN_TYPE))) {
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_INVALID_BIND_RULE_BOOLEAN_OPERATOR
.get(remainingOperand);
throw new AciException(message);
@@ -363,7 +363,7 @@
bindrule_2.setNegate(negate);
return new BindRule(bindrule, bindrule_2, operand);
} else {
- Message message = ERR_ACI_SYNTAX_INVALID_BIND_RULE_SYNTAX.get(
+ LocalizableMessage message = ERR_ACI_SYNTAX_INVALID_BIND_RULE_SYNTAX.get(
remainingBindruleStr);
throw new AciException(message);
}
@@ -432,7 +432,7 @@
case DAYOFWEEK:
if ((op != EnumBindRuleType.EQUAL_BINDRULE_TYPE)
&& (op != EnumBindRuleType.NOT_EQUAL_BINDRULE_TYPE)) {
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_INVALID_BIND_RULE_KEYWORD_OPERATOR_COMBO
.get(keyword.toString(), op.toString());
throw new AciException(message);
@@ -476,7 +476,7 @@
{
//The roledn keyword is not supported. Throw an exception with
//a message if it is seen in the ACI.
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_ROLEDN_NOT_SUPPORTED.get(expr);
throw new AciException(message);
}
@@ -521,7 +521,7 @@
break;
}
default: {
- Message message = WARN_ACI_SYNTAX_INVALID_BIND_RULE_KEYWORD.get(
+ LocalizableMessage message = WARN_ACI_SYNTAX_INVALID_BIND_RULE_KEYWORD.get(
keyword.toString());
throw new AciException(message);
}
--
Gitblit v1.10.0