From 80c58327faaa4873369f6bb949e62792c2f708e0 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.
---
opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java b/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
index 5a10f8b..c4558bc 100644
--- a/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
+++ b/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
@@ -26,9 +26,9 @@
*/
package org.opends.server.authorization.dseecompat;
+import org.opends.messages.Message;
-import static org.opends.server.messages.AciMessages.*;
-import static org.opends.server.messages.MessageHandler.getMessage;
+import static org.opends.messages.AccessControlMessages.*;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
@@ -144,9 +144,9 @@
throws AciException {
String[] vals=expression.split("#");
if(vals.length != 2) {
- int msgID = MSGID_ACI_SYNTAX_INVALID_USERATTR_EXPRESSION;
- String message = getMessage(msgID, expression);
- throw new AciException(msgID, message);
+ Message message =
+ WARN_ACI_SYNTAX_INVALID_USERATTR_EXPRESSION.get(expression);
+ throw new AciException(message);
}
UserAttrType userAttrType=getType(vals[1]);
switch (userAttrType) {
@@ -159,9 +159,9 @@
case ROLEDN: {
//The roledn keyword is not supported. Throw an exception with
//a message if it is seen in the expression.
- int msgID=MSGID_ACI_SYNTAX_ROLEDN_NOT_SUPPORTED;
- String message = getMessage(msgID, expression);
- throw new AciException(msgID, message);
+ Message message =
+ WARN_ACI_SYNTAX_ROLEDN_NOT_SUPPORTED.get(expression);
+ throw new AciException(message);
}
}
return new UserAttr(vals[0], vals[1], userAttrType, type);
@@ -247,18 +247,18 @@
else if(expr.equalsIgnoreCase("groupdn")) {
userAttrType=UserAttrType.GROUPDN;
/*
- int msgID = MSGID_ACI_SYNTAX_INVALID_USERATTR_KEYWORD;
- String message = getMessage(msgID, "The groupdn userattr" +
+ Message message = WARN_ACI_SYNTAX_INVALID_USERATTR_KEYWORD.get(
+ "The groupdn userattr" +
"keyword is not supported.");
- throw new AciException(msgID, message);
+ throw new AciException(message);
*/
} else if(expr.equalsIgnoreCase("roledn")) {
userAttrType=UserAttrType.ROLEDN;
/*
- int msgID = MSGID_ACI_SYNTAX_INVALID_USERATTR_KEYWORD;
- String message = getMessage(msgID, "The roledn userattr" +
+ Message message = WARN_ACI_SYNTAX_INVALID_USERATTR_KEYWORD.get(
+ "The roledn userattr" +
"keyword is not supported.");
- throw new AciException(msgID, message);
+ throw new AciException(message);
*/
} else if(expr.equalsIgnoreCase("ldapurl"))
userAttrType=UserAttrType.URL;
--
Gitblit v1.10.0