From a06fd90c9b6bfb5f9130146373ba18e5769593b6 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 29 Jan 2014 11:30:37 +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/admin/AdministrationConnector.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java b/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java
index 4749f51..176255c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java
@@ -26,7 +26,6 @@
*/
package org.opends.server.admin;
-import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.messages.AdminMessages.*;
import java.io.File;
import java.io.FileWriter;
@@ -62,7 +61,6 @@
import org.opends.server.util.SetupUtils;
import org.opends.server.admin.std.server.TrustManagerProviderCfg;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.FilePermission;
@@ -674,7 +672,7 @@
}
LocalizableMessage message = ERR_ADMIN_CERTIFICATE_GENERATION_MISSING_FILES
.get(err);
- logError(message);
+ logger.error(message);
throw new InitializationException(message);
}
@@ -724,16 +722,13 @@
new FilePermission(0600)))
{
// Log a warning that the permissions were not set.
- LocalizableMessage message = WARN_ADMIN_SET_PERMISSIONS_FAILED
- .get(pinFilePath);
- ErrorLogger.logError(message);
+ logger.warn(WARN_ADMIN_SET_PERMISSIONS_FAILED, pinFilePath);
}
}
catch (DirectoryException e)
{
// Log a warning that the permissions were not set.
- LocalizableMessage message = WARN_ADMIN_SET_PERMISSIONS_FAILED.get(pinFilePath);
- ErrorLogger.logError(message);
+ logger.warn(WARN_ADMIN_SET_PERMISSIONS_FAILED, pinFilePath);
}
}
@@ -749,7 +744,7 @@
{
logger.traceException(e);
LocalizableMessage message = ERR_ADMIN_CERTIFICATE_GENERATION.get(e.getMessage());
- logError(message);
+ logger.error(message);
throw new InitializationException(message);
}
}
--
Gitblit v1.10.0