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/loggers/debug/TextDebugLogPublisher.java | 93 ++++++++++++++++++++++------------------------
1 files changed, 45 insertions(+), 48 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java
index c9bfaa3..2b250c4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.loggers.debug;
+import org.opends.messages.Message;
import org.opends.server.api.*;
import org.opends.server.loggers.*;
@@ -44,13 +45,13 @@
import org.opends.server.admin.server.ConfigurationAddListener;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import static org.opends.server.messages.ConfigMessages.
- MSGID_CONFIG_LOGGER_INVALID_ROTATION_POLICY;
-import static org.opends.server.messages.ConfigMessages.
- MSGID_CONFIG_LOGGER_INVALID_RETENTION_POLICY;
-import static org.opends.server.messages.ConfigMessages.
- MSGID_CONFIG_LOGGING_CANNOT_CREATE_WRITER;
-import static org.opends.server.messages.MessageHandler.getMessage;
+import static org.opends.messages.ConfigMessages.
+ ERR_CONFIG_LOGGER_INVALID_ROTATION_POLICY;
+import static org.opends.messages.ConfigMessages.
+ WARN_CONFIG_LOGGER_INVALID_RETENTION_POLICY;
+import static org.opends.messages.ConfigMessages.
+ ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER;
+
import java.util.*;
import java.io.File;
@@ -161,10 +162,9 @@
}
else
{
- int msgID = MSGID_CONFIG_LOGGER_INVALID_ROTATION_POLICY;
- String message = getMessage(msgID, dn.toString(),
- config.dn().toString());
- throw new ConfigException(msgID, message);
+ Message message = ERR_CONFIG_LOGGER_INVALID_ROTATION_POLICY.get(
+ dn.toString(), config.dn().toString());
+ throw new ConfigException(message);
}
}
for(DN dn: config.getRetentionPolicyDN())
@@ -176,10 +176,9 @@
}
else
{
- int msgID = MSGID_CONFIG_LOGGER_INVALID_RETENTION_POLICY;
- String message = getMessage(msgID, dn.toString(),
- config.dn().toString());
- throw new ConfigException(msgID, message);
+ Message message = WARN_CONFIG_LOGGER_INVALID_RETENTION_POLICY.get(
+ dn.toString(), config.dn().toString());
+ throw new ConfigException(message);
}
}
@@ -196,18 +195,16 @@
}
catch(DirectoryException e)
{
- int msgID = MSGID_CONFIG_LOGGING_CANNOT_CREATE_WRITER;
- String message = getMessage(msgID, config.dn().toString(),
- String.valueOf(e));
- throw new InitializationException(msgID, message, e);
+ Message message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
+ config.dn().toString(), String.valueOf(e));
+ throw new InitializationException(message, e);
}
catch(IOException e)
{
- int msgID = MSGID_CONFIG_LOGGING_CANNOT_CREATE_WRITER;
- String message = getMessage(msgID, config.dn().toString(),
- String.valueOf(e));
- throw new InitializationException(msgID, message, e);
+ Message message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
+ config.dn().toString(), String.valueOf(e));
+ throw new InitializationException(message, e);
}
@@ -258,7 +255,7 @@
*/
@Override()
public boolean isConfigurationAcceptable(DebugLogPublisherCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
FileBasedDebugLogPublisherCfg config =
(FileBasedDebugLogPublisherCfg) configuration;
@@ -269,9 +266,9 @@
RotationPolicy policy = DirectoryServer.getRotationPolicy(dn);
if(policy == null)
{
- int msgID = MSGID_CONFIG_LOGGER_INVALID_ROTATION_POLICY;
- String message = getMessage(msgID, dn.toString(),
- config.dn().toString());
+ Message message = ERR_CONFIG_LOGGER_INVALID_ROTATION_POLICY.get(
+ dn.toString(),
+ config.dn().toString());
unacceptableReasons.add(message);
return false;
}
@@ -281,9 +278,9 @@
RetentionPolicy policy = DirectoryServer.getRetentionPolicy(dn);
if(policy != null)
{
- int msgID = MSGID_CONFIG_LOGGER_INVALID_RETENTION_POLICY;
- String message = getMessage(msgID, dn.toString(),
- config.dn().toString());
+ Message message = WARN_CONFIG_LOGGER_INVALID_RETENTION_POLICY.get(
+ dn.toString(),
+ config.dn().toString());
unacceptableReasons.add(message);
return false;
}
@@ -296,7 +293,7 @@
* {@inheritDoc}
*/
public boolean isConfigurationChangeAcceptable(
- FileBasedDebugLogPublisherCfg config, List<String> unacceptableReasons)
+ FileBasedDebugLogPublisherCfg config, List<Message> unacceptableReasons)
{
// Make sure the permission is valid.
try
@@ -317,9 +314,9 @@
}
catch(Exception e)
{
- int msgID = MSGID_CONFIG_LOGGING_CANNOT_CREATE_WRITER;
- String message = getMessage(msgID, config.dn().toString(),
- stackTraceToSingleLineString(e));
+ Message message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
+ config.dn().toString(),
+ stackTraceToSingleLineString(e));
unacceptableReasons.add(message);
return false;
}
@@ -336,7 +333,7 @@
// Default result code.
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
//Get the default/global settings
LogLevel logLevel =
@@ -410,9 +407,9 @@
}
else
{
- int msgID = MSGID_CONFIG_LOGGER_INVALID_ROTATION_POLICY;
- String message = getMessage(msgID, dn.toString(),
- config.dn().toString());
+ Message message = ERR_CONFIG_LOGGER_INVALID_ROTATION_POLICY.get(
+ dn.toString(),
+ config.dn().toString());
resultCode = DirectoryServer.getServerErrorResultCode();
messages.add(message);
}
@@ -426,9 +423,9 @@
}
else
{
- int msgID = MSGID_CONFIG_LOGGER_INVALID_RETENTION_POLICY;
- String message = getMessage(msgID, dn.toString(),
- config.dn().toString());
+ Message message = WARN_CONFIG_LOGGER_INVALID_RETENTION_POLICY.get(
+ dn.toString(),
+ config.dn().toString());
resultCode = DirectoryServer.getServerErrorResultCode();
messages.add(message);
}
@@ -466,9 +463,9 @@
}
catch(Exception e)
{
- int msgID = MSGID_CONFIG_LOGGING_CANNOT_CREATE_WRITER;
- String message = getMessage(msgID, config.dn().toString(),
- stackTraceToSingleLineString(e));
+ Message message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
+ config.dn().toString(),
+ stackTraceToSingleLineString(e));
resultCode = DirectoryServer.getServerErrorResultCode();
messages.add(message);
@@ -481,7 +478,7 @@
* {@inheritDoc}
*/
public boolean isConfigurationAddAcceptable(DebugTargetCfg config,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
return getTraceSettings(config.getDebugScope()) == null;
}
@@ -490,7 +487,7 @@
* {@inheritDoc}
*/
public boolean isConfigurationDeleteAcceptable(DebugTargetCfg config,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
// A delete should always be acceptable.
return true;
@@ -504,7 +501,7 @@
// Default result code.
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
addTraceSettings(config.getDebugScope(), new TraceSettings(config));
@@ -521,7 +518,7 @@
// Default result code.
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
removeTraceSettings(config.getDebugScope());
--
Gitblit v1.10.0