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/ParentInheritance.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java
index 3996018..79af60c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java
@@ -26,7 +26,7 @@
*/
package org.opends.server.authorization.dseecompat;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.AccessControlMessages.*;
import static org.opends.server.authorization.dseecompat.Aci.*;
@@ -98,7 +98,7 @@
if (skipParse) {
//The "parent[" pattern is invalid for ROLEDN user attr keyword.
if(pattern.startsWith(parentPat)) {
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_INVALID_USERATTR_ROLEDN_INHERITANCE_PATTERN
.get(pattern);
throw new AciException(message);
@@ -108,7 +108,7 @@
Matcher matcher=pattern1.matcher(pattern);
//Check if valid attribute type name.
if(!matcher.find() || matcher.groupCount() != 1) {
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_INVALID_ATTRIBUTE_TYPE_NAME.get(pattern);
throw new AciException(message);
}
@@ -139,7 +139,7 @@
*/
String[] toks=p.split("\\.");
if(toks.length != 2) {
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_INVALID_USERATTR_INHERITANCE_PATTERN
.get(pattern);
throw new AciException(message);
@@ -148,7 +148,7 @@
Matcher matcher=pattern1.matcher(toks[1]);
//Check if valid attribute type name.
if(!matcher.find() || matcher.groupCount() != 1) {
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_INVALID_ATTRIBUTE_TYPE_NAME.get(toks[1]);
throw new AciException(message);
}
@@ -164,13 +164,13 @@
if(numLevels < MAX_LEVELS) {
levels[numLevels++]=Integer.decode(v);
} else {
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_MAX_USERATTR_INHERITANCE_LEVEL_EXCEEDED.
get(pattern, Integer.toString(MAX_LEVELS));
throw new AciException(message);
}
} catch (NumberFormatException ex) {
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_INVALID_INHERITANCE_VALUE.get(pattern);
throw new AciException(message);
}
@@ -182,19 +182,19 @@
LDAPURL url=LDAPURL.decode(pattern, true);
LinkedHashSet<String>attrs=url.getAttributes();
if(attrs.size() != 1) {
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_INVALID_USERATTR_ATTR_URL.get(pattern);
throw new AciException(message);
}
baseDN=url.getBaseDN();
if(baseDN.isRootDN()){
- Message message =
+ LocalizableMessage message =
WARN_ACI_SYNTAX_INVALID_USERATTR_BASEDN_URL.get(pattern);
throw new AciException(message);
}
attrTypeStr=attrs.iterator().next();
} catch (DirectoryException ex) {
- Message message = WARN_ACI_SYNTAX_INVALID_USERATTR_URL.get(
+ LocalizableMessage message = WARN_ACI_SYNTAX_INVALID_USERATTR_URL.get(
ex.getMessageObject());
throw new AciException(message);
}
--
Gitblit v1.10.0