From 1d5d1a6a4a0a58d6bb4803527dacb6641c027816 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 28 Jan 2014 13:34:12 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java | 49 ++++++++++---------------------------------------
1 files changed, 10 insertions(+), 39 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
index 3d251a3..01c7c8b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
@@ -52,9 +52,7 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.DebugLogLevel;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -69,10 +67,7 @@
extends KeyManagerProvider<FileBasedKeyManagerProviderCfg>
implements ConfigurationChangeListener<FileBasedKeyManagerProviderCfg>
{
- /**
- * The tracer object for the debug logger.
- */
- private static final DebugTracer TRACER = getTracer();
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -129,10 +124,7 @@
throw new InitializationException(message);
}
} catch (SecurityException e) {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
LocalizableMessage message = ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_FILE.get(
String.valueOf(configEntryDN), getExceptionMessage(e));
@@ -146,10 +138,7 @@
KeyStore.getInstance(configuration.getKeyStoreType());
keyStoreType = configuration.getKeyStoreType();
} catch (KeyStoreException kse) {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, kse);
- }
+ logger.traceException(kse);
LocalizableMessage message = ERR_FILE_KEYMANAGER_INVALID_TYPE.
get(String.valueOf(configuration.getKeyStoreType()),
@@ -269,10 +258,7 @@
}
catch (Exception e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
LocalizableMessage message = ERR_FILE_KEYMANAGER_CANNOT_LOAD.get(
keyStoreFile, getExceptionMessage(e));
@@ -291,10 +277,7 @@
}
catch (Exception e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
LocalizableMessage message = ERR_FILE_KEYMANAGER_CANNOT_CREATE_FACTORY.get(
keyStoreFile, getExceptionMessage(e));
@@ -344,10 +327,7 @@
}
catch (Exception e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
unacceptableReasons.add(ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_FILE.get(
String.valueOf(cfgEntryDN),
@@ -364,10 +344,7 @@
}
catch (KeyStoreException kse)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, kse);
- }
+ logger.traceException(kse);
unacceptableReasons.add(ERR_FILE_KEYMANAGER_INVALID_TYPE.get(
String.valueOf(configuration.getKeyStoreType()),
@@ -504,10 +481,7 @@
}
catch (Exception e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
resultCode = DirectoryServer.getServerErrorResultCode();
@@ -527,10 +501,7 @@
}
catch (KeyStoreException kse)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, kse);
- }
+ logger.traceException(kse);
resultCode = DirectoryServer.getServerErrorResultCode();
--
Gitblit v1.10.0