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/AciList.java | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java b/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java
index 563c3e4..11caf90 100644
--- a/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java
+++ b/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java
@@ -26,12 +26,12 @@
*/
package org.opends.server.authorization.dseecompat;
+import org.opends.messages.Message;
import org.opends.server.api.Backend;
import static org.opends.server.authorization.dseecompat.AciHandler.*;
import static org.opends.server.loggers.ErrorLogger.logError;
-import static org.opends.server.messages.AciMessages.*;
-import static org.opends.server.messages.MessageHandler.getMessage;
+import static org.opends.messages.AccessControlMessages.*;
import org.opends.server.types.*;
import java.util.*;
@@ -139,7 +139,7 @@
* @return The number of valid ACI attribute values added to the ACI list.
*/
public synchronized int addAci(List<? extends Entry> entries,
- LinkedList<String> failedACIMsgs)
+ LinkedList<Message> failedACIMsgs)
{
// Copy the ACI list.
LinkedHashMap<DN,List<Aci>> aciCopy = copyList();
@@ -171,7 +171,7 @@
*/
public synchronized int addAci(Entry entry, boolean hasAci,
boolean hasGlobalAci,
- LinkedList<String> failedACIMsgs) {
+ LinkedList<Message> failedACIMsgs) {
int validAcis=0;
// Copy the ACI list.
@@ -213,7 +213,7 @@
private static int addAciAttributeList(LinkedHashMap<DN,List<Aci>> aciList,
DN dn, DN configDN,
List<Attribute> attributeList,
- LinkedList<String> failedACIMsgs) {
+ LinkedList<Message> failedACIMsgs) {
if (attributeList == null) {
return 0;
@@ -228,14 +228,14 @@
acis.add(aci);
validAcis++;
} catch (AciException ex) {
- int msgID = MSGID_ACI_ADD_LIST_FAILED_DECODE;
DN msgDN=dn;
if(dn == DN.nullDN()) {
msgDN=configDN;
}
- String message = getMessage(msgID, value.getValue().toString(),
- String.valueOf(msgDN),
- ex.getMessage());
+ Message message = WARN_ACI_ADD_LIST_FAILED_DECODE.get(
+ value.getValue().toString(),
+ String.valueOf(msgDN),
+ ex.getMessage());
failedACIMsgs.add(message);
}
}
@@ -264,7 +264,7 @@
// Copy the ACI list.
LinkedHashMap<DN,List<Aci>> aciCopy = copyList();
- LinkedList<String>failedACIMsgs=new LinkedList<String>();
+ LinkedList<Message>failedACIMsgs=new LinkedList<Message>();
//Process "aci" attribute types.
if(hasAci) {
aciCopy.remove(oldEntry.getDN());
@@ -387,13 +387,9 @@
//This should never happen since only a copy of the
//ACI with a new DN is being made. Log a message if it does and
//keep going.
- int msgID = MSGID_ACI_ADD_LIST_FAILED_DECODE;
- String message = getMessage(msgID, aci.toString(),
- String.valueOf(relocateDN),
- ex.getMessage());
- logError(ErrorLogCategory.ACCESS_CONTROL,
- ErrorLogSeverity.INFORMATIONAL,
- message, msgID);
+ Message message = WARN_ACI_ADD_LIST_FAILED_DECODE.get(
+ aci.toString(), String.valueOf(relocateDN), ex.getMessage());
+ logError(message);
}
}
newCopyList.put(relocateDN, acis);
--
Gitblit v1.10.0