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/loggers/AccessLogger.java | 75 +++++++++++++++++++------------------
1 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/opends/src/server/org/opends/server/loggers/AccessLogger.java b/opends/src/server/org/opends/server/loggers/AccessLogger.java
index ca4586f..e5ab49e 100644
--- a/opends/src/server/org/opends/server/loggers/AccessLogger.java
+++ b/opends/src/server/org/opends/server/loggers/AccessLogger.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.loggers;
+import org.opends.messages.Message;
@@ -47,11 +48,11 @@
import org.opends.server.config.ConfigException;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
-import static org.opends.server.messages.ConfigMessages.
- MSGID_CONFIG_LOGGER_CANNOT_CREATE_LOGGER;
-import static org.opends.server.messages.ConfigMessages.
- MSGID_CONFIG_LOGGER_INVALID_ACCESS_LOGGER_CLASS;
-import static org.opends.server.messages.MessageHandler.getMessage;
+import static org.opends.messages.ConfigMessages.
+ ERR_CONFIG_LOGGER_CANNOT_CREATE_LOGGER;
+import static org.opends.messages.ConfigMessages.
+ ERR_CONFIG_LOGGER_INVALID_ACCESS_LOGGER_CLASS;
+
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
@@ -162,8 +163,9 @@
/**
* {@inheritDoc}
*/
- public boolean isConfigurationAddAcceptable(AccessLogPublisherCfg config,
- List<String> unacceptableReasons)
+ public boolean isConfigurationAddAcceptable(
+ AccessLogPublisherCfg config,
+ List<Message> unacceptableReasons)
{
return !config.isEnabled() ||
isJavaClassAcceptable(config, unacceptableReasons);
@@ -172,8 +174,9 @@
/**
* {@inheritDoc}
*/
- public boolean isConfigurationChangeAcceptable(AccessLogPublisherCfg config,
- List<String> unacceptableReasons)
+ public boolean isConfigurationChangeAcceptable(
+ AccessLogPublisherCfg config,
+ List<Message> unacceptableReasons)
{
return !config.isEnabled() ||
isJavaClassAcceptable(config, unacceptableReasons);
@@ -187,7 +190,7 @@
// Default result code.
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
config.addAccessChangeListener(this);
@@ -205,7 +208,7 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- messages.add(e.getMessage());
+ messages.add(e.getMessageObject());
resultCode = DirectoryServer.getServerErrorResultCode();
}
catch (Exception e)
@@ -214,9 +217,10 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_CONFIG_LOGGER_CANNOT_CREATE_LOGGER;
- messages.add(getMessage(msgID, String.valueOf(config.dn().toString()),
- stackTraceToSingleLineString(e)));
+
+ messages.add(ERR_CONFIG_LOGGER_CANNOT_CREATE_LOGGER.get(
+ String.valueOf(config.dn().toString()),
+ stackTraceToSingleLineString(e)));
resultCode = DirectoryServer.getServerErrorResultCode();
}
}
@@ -232,7 +236,7 @@
// Default result code.
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
DN dn = config.dn();
@@ -282,8 +286,9 @@
/**
* {@inheritDoc}
*/
- public boolean isConfigurationDeleteAcceptable(AccessLogPublisherCfg config,
- List<String> unacceptableReasons)
+ public boolean isConfigurationDeleteAcceptable(
+ AccessLogPublisherCfg config,
+ List<Message> unacceptableReasons)
{
DN dn = config.dn();
@@ -334,7 +339,7 @@
}
private boolean isJavaClassAcceptable(AccessLogPublisherCfg config,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
String className = config.getJavaImplementationClass();
AccessLogPublisherCfgDefn d = AccessLogPublisherCfgDefn.getInstance();
@@ -347,10 +352,10 @@
theClass = pd.loadClass(className, AccessLogPublisher.class);
publisher = theClass.newInstance();
} catch (Exception e) {
- int msgID = MSGID_CONFIG_LOGGER_INVALID_ACCESS_LOGGER_CLASS;
- String message = getMessage(msgID, className,
- config.dn().toString(),
- String.valueOf(e));
+ Message message = ERR_CONFIG_LOGGER_INVALID_ACCESS_LOGGER_CLASS.get(
+ className,
+ config.dn().toString(),
+ String.valueOf(e));
unacceptableReasons.add(message);
return false;
}
@@ -370,10 +375,10 @@
return false;
}
} catch (Exception e) {
- int msgID = MSGID_CONFIG_LOGGER_INVALID_ACCESS_LOGGER_CLASS;
- String message = getMessage(msgID, className,
- config.dn().toString(),
- String.valueOf(e));
+ Message message = ERR_CONFIG_LOGGER_INVALID_ACCESS_LOGGER_CLASS.get(
+ className,
+ config.dn().toString(),
+ String.valueOf(e));
unacceptableReasons.add(message);
return false;
}
@@ -405,19 +410,15 @@
{
// Rethrow the exceptions thrown be the invoked method.
Throwable e = ite.getTargetException();
- int msgID = MSGID_CONFIG_LOGGER_INVALID_ACCESS_LOGGER_CLASS;
- String message = getMessage(msgID, className,
- config.dn().toString(),
- stackTraceToSingleLineString(e));
- throw new ConfigException(msgID, message, e);
+ Message message = ERR_CONFIG_LOGGER_INVALID_ACCESS_LOGGER_CLASS.get(
+ className, config.dn().toString(), stackTraceToSingleLineString(e));
+ throw new ConfigException(message, e);
}
catch (Exception e)
{
- int msgID = MSGID_CONFIG_LOGGER_INVALID_ACCESS_LOGGER_CLASS;
- String message = getMessage(msgID, className,
- config.dn().toString(),
- String.valueOf(e));
- throw new ConfigException(msgID, message, e);
+ Message message = ERR_CONFIG_LOGGER_INVALID_ACCESS_LOGGER_CLASS.get(
+ className, config.dn().toString(), String.valueOf(e));
+ throw new ConfigException(message, e);
}
// The access publisher has been successfully initialized.
@@ -456,7 +457,7 @@
*/
public static void logDisconnect(ClientConnection clientConnection,
DisconnectReason disconnectReason,
- String message)
+ Message message)
{
for (AccessLogPublisher publisher : accessPublishers)
{
--
Gitblit v1.10.0