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/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java b/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java
index d1ffafa..5ff0b84 100644
--- a/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java
+++ b/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java
@@ -34,7 +34,9 @@
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
+
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.ClientConnection;
@@ -42,12 +44,11 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.HostPort;
-
import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
-
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.InitializationException;
+
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
@@ -62,6 +63,8 @@
implements ConfigurationChangeListener<SNMPConnectionHandlerCfg>,
AlertGenerator {
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// Current configuration
SNMPConnectionHandlerCfg currentConfig;
/**
@@ -98,8 +101,7 @@
throws ConfigException, InitializationException {
if (configuration == null) {
- LocalizableMessage message = ERR_SNMP_CONNHANDLER_NO_CONFIGURATION.get();
- logError(message);
+ logger.error(ERR_SNMP_CONNHANDLER_NO_CONFIGURATION);
return;
}
@@ -108,9 +110,8 @@
String jarLocation = this.currentConfig.getOpendmkJarfile();
if ((jarLocation==null) || (jarLocation.length()==0)){
- LocalizableMessage message = ERR_SNMP_CONNHANDLER_NO_OPENDMK_JARFILES.get();
- logError(message);
- return;
+ logger.error(ERR_SNMP_CONNHANDLER_NO_OPENDMK_JARFILES);
+ return;
}
// Get the jarFile Location and test if exists to be able to
@@ -126,10 +127,8 @@
}
if (!fullpathFile.exists()) {
- LocalizableMessage message =
- ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_DOES_NOT_EXIST.get(
+ logger.error(ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_DOES_NOT_EXIST,
fullpathFile.getAbsolutePath());
- logError(message);
return;
}
@@ -139,10 +138,8 @@
this.currentConfig.getListenPort()));
if (!this.isOperational(fullpathFile)) {
- LocalizableMessage message =
- ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_NOT_OPERATIONAL.get(
+ logger.error(ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_NOT_OPERATIONAL,
fullpathFile.getAbsolutePath());
- logError(message);
return;
}
@@ -154,8 +151,7 @@
this.provider.initializeConnectionHandler(this.currentConfig);
}
catch (Exception ex) {
- LocalizableMessage message = ERR_SNMP_CONNHANDLER_BAD_CONFIGURATION.get();
- logError(message);
+ logger.error(ERR_SNMP_CONNHANDLER_BAD_CONFIGURATION);
return;
}
}
@@ -258,7 +254,6 @@
try {
String url = "jar:" + file.toURI().toURL() + "!/";
URL u = new URL(url);
- Class[] parameters = new Class[]{URL.class};
URLClassLoader sysloader =
(URLClassLoader)ClassLoader.getSystemClassLoader();
Class sysclass = URLClassLoader.class;
--
Gitblit v1.10.0