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/util/Platform.java |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/util/Platform.java b/opendj3-server-dev/src/server/org/opends/server/util/Platform.java
index fc6b987..ef94dd5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/Platform.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/Platform.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2013 ForgeRock AS.
+ *      Portions Copyright 2013-2014 ForgeRock AS.
  */
 
 package org.opends.server.util;
@@ -44,7 +44,7 @@
 import java.lang.management.MemoryUsage;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
 import static org.opends.messages.UtilityMessages.*;
 
 
@@ -132,17 +132,17 @@
       }
       catch (ClassNotFoundException e)
       {
-        Message msg = ERR_CERTMGR_CLASS_NOT_FOUND.get(e.getMessage());
+        LocalizableMessage msg = ERR_CERTMGR_CLASS_NOT_FOUND.get(e.getMessage());
         throw new ExceptionInInitializerError(msg.toString());
       }
       catch (SecurityException e)
       {
-        Message msg = ERR_CERTMGR_SECURITY.get(e.getMessage());
+        LocalizableMessage msg = ERR_CERTMGR_SECURITY.get(e.getMessage());
         throw new ExceptionInInitializerError(msg.toString());
       }
       catch (NoSuchMethodException e)
       {
-        Message msg = ERR_CERTMGR_NO_METHOD.get(e.getMessage());
+        LocalizableMessage msg = ERR_CERTMGR_NO_METHOD.get(e.getMessage());
         throw new ExceptionInInitializerError(msg.toString());
       }
     }
@@ -176,7 +176,7 @@
       {
         if (ks == null)
         {
-          Message msg = ERR_CERTMGR_KEYSTORE_NONEXISTANT.get();
+          LocalizableMessage msg = ERR_CERTMGR_KEYSTORE_NONEXISTANT.get();
           throw new KeyStoreException(msg.toString());
         }
         ks.deleteEntry(alias);
@@ -186,7 +186,7 @@
       }
       catch (Exception e)
       {
-        Message msg = ERR_CERTMGR_DELETE_ALIAS.get(alias, e.getMessage());
+        LocalizableMessage msg = ERR_CERTMGR_DELETE_ALIAS.get(alias, e.getMessage());
         throw new KeyStoreException(msg.toString());
       }
     }
@@ -229,7 +229,7 @@
         // Do not support certificate replies.
         if (ks.entryInstanceOf(alias, KeyStore.PrivateKeyEntry.class))
         {
-          Message msg = ERR_CERTMGR_CERT_REPLIES_INVALID.get(alias);
+          LocalizableMessage msg = ERR_CERTMGR_CERT_REPLIES_INVALID.get(alias);
           throw new KeyStoreException(msg.toString());
         }
         else if (!ks.containsAlias(alias)
@@ -238,7 +238,7 @@
           trustedCert(alias, cf, ks, inStream);
         else
         {
-          Message msg = ERR_CERTMGR_ALIAS_INVALID.get(alias);
+          LocalizableMessage msg = ERR_CERTMGR_ALIAS_INVALID.get(alias);
           throw new KeyStoreException(msg.toString());
         }
         FileOutputStream fileOutStream = new FileOutputStream(ksPath);
@@ -248,7 +248,7 @@
       }
       catch (Exception e)
       {
-        Message msg = ERR_CERTMGR_ADD_CERT.get(alias, e.getMessage());
+        LocalizableMessage msg = ERR_CERTMGR_ADD_CERT.get(alias, e.getMessage());
         throw new KeyStoreException(msg.toString());
       }
     }
@@ -292,7 +292,7 @@
         }
         else if (ks.containsAlias(alias))
         {
-          Message msg = ERR_CERTMGR_ALIAS_ALREADY_EXISTS.get(alias);
+          LocalizableMessage msg = ERR_CERTMGR_ALIAS_ALREADY_EXISTS.get(alias);
           throw new KeyStoreException(msg.toString());
         }
         Object keypair = certKeyGenCons.newInstance(KEY_ALGORITHM,
@@ -318,7 +318,7 @@
       }
       catch (Exception e)
       {
-        Message msg = ERR_CERTMGR_GEN_SELF_SIGNED_CERT.get(alias, e
+        LocalizableMessage msg = ERR_CERTMGR_GEN_SELF_SIGNED_CERT.get(alias, e
             .getMessage());
         throw new KeyStoreException(msg.toString());
       }
@@ -351,7 +351,7 @@
       {
         if (ks.containsAlias(alias))
         {
-          Message msg = ERR_CERTMGR_ALIAS_ALREADY_EXISTS.get(alias);
+          LocalizableMessage msg = ERR_CERTMGR_ALIAS_ALREADY_EXISTS.get(alias);
           throw new KeyStoreException(msg.toString());
         }
         X509Certificate cert = (X509Certificate) cf.generateCertificate(in);
@@ -360,7 +360,7 @@
       }
       catch (Exception e)
       {
-        Message msg = ERR_CERTMGR_TRUSTED_CERT.get(alias, e.getMessage());
+        LocalizableMessage msg = ERR_CERTMGR_TRUSTED_CERT.get(alias, e.getMessage());
         throw new KeyStoreException(msg.toString());
       }
     }

--
Gitblit v1.10.0