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/tools/VerifyIndex.java |   43 ++++++++++++++-----------------------------
 1 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java b/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
index b0794ce..82bf1c2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
@@ -29,6 +29,7 @@
 
 
 import org.opends.server.api.Backend;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
 import org.opends.server.api.ErrorLogPublisher;
 import org.opends.server.api.DebugLogPublisher;
 import org.opends.server.backends.jeb.BackendImpl;
@@ -56,7 +57,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.opends.server.loggers.ErrorLogger.*;
 import static org.opends.messages.ToolMessages.*;
 
 import org.forgerock.i18n.LocalizableMessage;
@@ -75,6 +75,9 @@
  */
 public class VerifyIndex
 {
+
+  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
   /**
    * Processes the command-line arguments and invokes the verify process.
    *
@@ -395,16 +398,12 @@
     }
     catch (DirectoryException de)
     {
-      LocalizableMessage message = ERR_CANNOT_DECODE_BASE_DN.get(
-          baseDNString.getValue(), de.getMessageObject());
-      logError(message);
+      logger.error(ERR_CANNOT_DECODE_BASE_DN, baseDNString.getValue(), de.getMessageObject());
       return 1;
     }
     catch (Exception e)
     {
-      LocalizableMessage message = ERR_CANNOT_DECODE_BASE_DN.get(
-          baseDNString.getValue(), getExceptionMessage(e));
-      logError(message);
+      logger.error(ERR_CANNOT_DECODE_BASE_DN, baseDNString.getValue(), getExceptionMessage(e));
       return 1;
     }
 
@@ -434,9 +433,7 @@
           }
           else
           {
-            LocalizableMessage message =
-                ERR_MULTIPLE_BACKENDS_FOR_BASE.get(baseDNString.getValue());
-            logError(message);
+            logger.error(ERR_MULTIPLE_BACKENDS_FOR_BASE, baseDNString.getValue());
             return 1;
           }
           break;
@@ -446,15 +443,13 @@
 
     if (backend == null)
     {
-      LocalizableMessage message = ERR_NO_BACKENDS_FOR_BASE.get(baseDNString.getValue());
-      logError(message);
+      logger.error(ERR_NO_BACKENDS_FOR_BASE, baseDNString.getValue());
       return 1;
     }
 
     if (!(backend instanceof BackendImpl))
     {
-      LocalizableMessage message = ERR_BACKEND_NO_INDEXING_SUPPORT.get();
-      logError(message);
+      logger.error(ERR_BACKEND_NO_INDEXING_SUPPORT);
       return 1;
     }
 
@@ -484,17 +479,13 @@
       StringBuilder failureReason = new StringBuilder();
       if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
       {
-        LocalizableMessage message = ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND.get(
-            backend.getBackendID(), String.valueOf(failureReason));
-        logError(message);
+        logger.error(ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
         return 1;
       }
     }
     catch (Exception e)
     {
-      LocalizableMessage message = ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND.get(
-          backend.getBackendID(), getExceptionMessage(e));
-      logError(message);
+      logger.error(ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
       return 1;
     }
 
@@ -519,9 +510,7 @@
     }
     catch (Exception e)
     {
-      LocalizableMessage message = ERR_VERIFYINDEX_ERROR_DURING_VERIFY.get(
-          stackTraceToSingleLineString(e));
-      logError(message);
+      logger.error(ERR_VERIFYINDEX_ERROR_DURING_VERIFY, stackTraceToSingleLineString(e));
       returnCode = 1;
     }
 
@@ -533,16 +522,12 @@
       StringBuilder failureReason = new StringBuilder();
       if (! LockFileManager.releaseLock(lockFile, failureReason))
       {
-        LocalizableMessage message = WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND.get(
-            backend.getBackendID(), String.valueOf(failureReason));
-        logError(message);
+        logger.warn(WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
       }
     }
     catch (Exception e)
     {
-      LocalizableMessage message = WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND.get(
-          backend.getBackendID(), getExceptionMessage(e));
-      logError(message);
+      logger.warn(WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
     }
 
     return returnCode;

--
Gitblit v1.10.0