From cfc513043c5830b5a967733066068c7097b42e3c 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.
---
opendj-sdk/opends/src/server/org/opends/server/tasks/InitializeTask.java | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/InitializeTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/InitializeTask.java
index 4d58886..603c2c7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/InitializeTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/InitializeTask.java
@@ -25,21 +25,19 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.tasks;
+import org.opends.messages.MessageBuilder;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.core.DirectoryServer.getAttributeType;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
-import static org.opends.server.messages.CoreMessages.*;
-import static org.opends.server.messages.MessageHandler.getMessage;
-
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
-import org.opends.server.messages.TaskMessages;
+import org.opends.messages.TaskMessages;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.replication.plugin.ReplicationDomain;
import org.opends.server.types.Attribute;
@@ -48,8 +46,6 @@
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
-import org.opends.server.types.ErrorLogCategory;
-import org.opends.server.types.ErrorLogSeverity;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
import org.opends.server.types.ResultCode;
@@ -113,10 +109,11 @@
}
catch(Exception e)
{
- int msgID = TaskMessages.MSGID_TASK_INITIALIZE_INVALID_DN;
- String message = getMessage(msgID) + e.getMessage();
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(TaskMessages.ERR_TASK_INITIALIZE_INVALID_DN.get());
+ mb.append(e.getMessage());
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
- message, msgID);
+ mb.toMessage());
}
domain = ReplicationDomain.retrievesReplicationDomain(domainDN);
@@ -161,10 +158,7 @@
catch(InterruptedException ie) {}
catch(DirectoryException de)
{
- int msgID = de.getMessageID();
- String message = getMessage(msgID, de.getErrorMessage());
- logError(ErrorLogCategory.TASK, ErrorLogSeverity.SEVERE_ERROR,
- message, msgID);
+ logError(de.getMessageObject());
initState = TaskState.STOPPED_BY_ERROR;
}
@@ -189,10 +183,7 @@
{
if (de != null)
{
- int msgID = de.getMessageID();
- String message = getMessage(msgID, de.getErrorMessage());
- logError(ErrorLogCategory.TASK, ErrorLogSeverity.SEVERE_ERROR,
- message, msgID);
+ logError(de.getMessageObject());
}
if (debugEnabled())
{
--
Gitblit v1.10.0