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/backends/NullBackend.java |   38 +++++++++++---------------------------
 1 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/NullBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/NullBackend.java
index 8a95b8b..5ea02e4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/NullBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/NullBackend.java
@@ -32,9 +32,7 @@
 import java.util.HashSet;
 
 import java.util.Map;
-import org.opends.messages.Category;
-import org.opends.messages.Message;
-import org.opends.messages.Severity;
+import org.forgerock.i18n.LocalizableMessage;
 import org.opends.server.admin.Configuration;
 import org.opends.server.admin.std.server.BackendCfg;
 import org.opends.server.api.Backend;
@@ -207,7 +205,7 @@
           TRACER.debugCaught(DebugLogLevel.ERROR, e);
         }
 
-        Message message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
+        LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
             dn.toString(), getExceptionMessage(e));
         throw new InitializationException(message, e);
       }
@@ -219,9 +217,7 @@
     String topOCName = "top";
     ObjectClass topOC = DirectoryServer.getObjectClass(topOCName);
     if (topOC == null) {
-      throw new InitializationException(Message.raw(
-        Category.BACKEND, Severity.FATAL_ERROR,
-        "Unable to locate " + topOCName +
+      throw new InitializationException(LocalizableMessage.raw("Unable to locate " + topOCName +
         " objectclass in the current server schema"));
     }
     objectClasses.put(topOC, topOCName);
@@ -242,9 +238,7 @@
     String extOCName = "extensibleobject";
     ObjectClass extOC = DirectoryServer.getObjectClass(extOCName);
     if (extOC == null) {
-      throw new InitializationException(Message.raw(
-        Category.BACKEND, Severity.FATAL_ERROR,
-        "Unable to locate " + extOCName +
+      throw new InitializationException(LocalizableMessage.raw("Unable to locate " + extOCName +
         " objectclass in the current server schema"));
     }
     objectClasses.put(extOC, extOCName);
@@ -453,8 +447,7 @@
         TRACER.debugCaught(DebugLogLevel.ERROR, e);
       }
 
-      Message message = Message.raw(
-        Category.BACKEND, Severity.SEVERE_ERROR, e.getMessage());
+      LocalizableMessage message = LocalizableMessage.raw(e.getMessage());
       throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
         message);
     }
@@ -491,8 +484,7 @@
     }
     catch (Exception e)
     {
-      Message message = Message.raw(
-        Category.BACKEND, Severity.SEVERE_ERROR, e.getMessage());
+      LocalizableMessage message = LocalizableMessage.raw(e.getMessage());
       throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                    message);
     }
@@ -514,8 +506,7 @@
         {
           if (! le.canContinueReading())
           {
-            Message message = Message.raw(
-              Category.BACKEND, Severity.SEVERE_ERROR, le.getMessage());
+            LocalizableMessage message = LocalizableMessage.raw(le.getMessage());
             throw new DirectoryException(
               DirectoryServer.getServerErrorResultCode(),message);
           }
@@ -545,8 +536,7 @@
     }
     catch (Exception e)
     {
-      Message message = Message.raw(
-        Category.BACKEND, Severity.SEVERE_ERROR, e.getMessage());
+      LocalizableMessage message = LocalizableMessage.raw(e.getMessage());
       throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                    message);
     }
@@ -584,9 +574,7 @@
   public void createBackup(BackupConfig backupConfig)
          throws DirectoryException
   {
-    Message message = Message.raw(
-        Category.BACKEND, Severity.SEVERE_ERROR,
-        "The null backend does not support backup operation");
+    LocalizableMessage message = LocalizableMessage.raw("The null backend does not support backup operation");
     throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
   }
 
@@ -598,9 +586,7 @@
                            String backupID)
          throws DirectoryException
   {
-    Message message = Message.raw(
-        Category.BACKEND, Severity.SEVERE_ERROR,
-        "The null backend does not support remove backup operation");
+    LocalizableMessage message = LocalizableMessage.raw("The null backend does not support remove backup operation");
     throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
   }
 
@@ -621,9 +607,7 @@
   public void restoreBackup(RestoreConfig restoreConfig)
          throws DirectoryException
   {
-    Message message = Message.raw(
-        Category.BACKEND, Severity.SEVERE_ERROR,
-        "The null backend does not support restore operation");
+    LocalizableMessage message = LocalizableMessage.raw("The null backend does not support restore operation");
     throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
   }
 

--
Gitblit v1.10.0