From 81d36161ce5367fa7aa9a5d99dc8b80eacfa7cdf Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 24 Jan 2014 14:43:46 +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/crypto/CryptoManagerSync.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
index b11ff90..2d5d3e8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
+++ b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
@@ -56,7 +56,7 @@
 import org.opends.server.core.DeleteOperation;
 import org.opends.server.core.AddOperation;
 import static org.opends.messages.CoreMessages.*;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
 import org.opends.admin.ads.ADSContext;
 
 import java.util.LinkedHashSet;
@@ -214,7 +214,7 @@
     ResultCode resultCode = searchOperation.getResultCode();
     if (resultCode != ResultCode.SUCCESS)
     {
-      Message message =
+      LocalizableMessage message =
            INFO_TRUSTSTORESYNC_ADMIN_SUFFIX_SEARCH_FAILED.get(
                 String.valueOf(adminSuffixDN),
                 searchOperation.getErrorMessage().toString());
@@ -234,7 +234,7 @@
           TRACER.debugCaught(DebugLogLevel.ERROR, e);
         }
 
-        Message message = ERR_TRUSTSTORESYNC_EXCEPTION.get(
+        LocalizableMessage message = ERR_TRUSTSTORESYNC_EXCEPTION.get(
              stackTraceToSingleLineString(e));
         ErrorLogger.logError(message);
       }
@@ -436,7 +436,7 @@
 
     if (delOperation.getResultCode() != ResultCode.SUCCESS)
     {
-      Message message = INFO_TRUSTSTORESYNC_DELETE_FAILED.get(
+      LocalizableMessage message = INFO_TRUSTSTORESYNC_DELETE_FAILED.get(
            String.valueOf(dstDN),
            String.valueOf(delOperation.getErrorMessage()));
       ErrorLogger.logError(message);
@@ -479,7 +479,7 @@
     AddOperation addOperation = conn.processAdd(addEntry);
     if (addOperation.getResultCode() != ResultCode.SUCCESS)
     {
-      Message message = INFO_TRUSTSTORESYNC_ADD_FAILED.get(
+      LocalizableMessage message = INFO_TRUSTSTORESYNC_ADD_FAILED.get(
            String.valueOf(dstDN),
            String.valueOf(addOperation.getErrorMessage()));
       ErrorLogger.logError(message);
@@ -512,7 +512,7 @@
       }
       catch (CryptoManagerException e)
       {
-        Message message = Message.raw("Failed to import key entry: %s",
+        LocalizableMessage message = LocalizableMessage.raw("Failed to import key entry: %s",
                                       e.getMessage());
         ErrorLogger.logError(message);
       }
@@ -588,7 +588,7 @@
       }
       catch (CryptoManagerException e)
       {
-        Message message = Message.raw("Failed to import modified key entry: %s",
+        LocalizableMessage message = LocalizableMessage.raw("Failed to import modified key entry: %s",
                                       e.getMessage());
         ErrorLogger.logError(message);
       }

--
Gitblit v1.10.0