From 2acafb0369cf46cf556777dc34881fe900c70e6d Mon Sep 17 00:00:00 2001
From: david_page <david_page@localhost>
Date: Fri, 05 Oct 2007 17:25:06 +0000
Subject: [PATCH] Issue 466 (partial) CryptoManager start on TODO: i18n

---
 opends/src/messages/messages/core.properties                 |    8 ++++++++
 opends/src/server/org/opends/server/types/CryptoManager.java |   20 ++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/opends/src/messages/messages/core.properties b/opends/src/messages/messages/core.properties
index 8f02e80..9720add 100644
--- a/opends/src/messages/messages/core.properties
+++ b/opends/src/messages/messages/core.properties
@@ -1675,3 +1675,11 @@
 SEVERE_WARN_GROUP_FILTER_NOT_INDEXED_660=The search filter "%s" used by group \
  implementation %s is not indexed in backend %s.  Backend initialization \
  for this group implementation may take a very long time to complete
+SEVERE_ERR_CRYPTOMGR_CANNOT_GET_PREFERRED_DIGEST_661=CryptoManager cannot get \
+ preferred digest:  %s
+SEVERE_ERR_CRYPTOMGR_CANNOT_GET_PREFERRED_MAC_ENGINE_662=CryptoManager cannot \
+ get preferred MAC engine:  %s
+SEVERE_ERR_CRYPTOMGR_CANNOT_GET_PREFERRED_ENCRYPTION_CIPHER_663=CryptoManager \
+ cannot get preferred encryption cipher:  %s
+SEVERE_ERR_CRYPTOMGR_CANNOT_GET_PREFERRED_KEY_WRAPPING_CIPHER_664=CryptoManager \
+ cannot get preferred key wrapping cipher:  %s
diff --git a/opends/src/server/org/opends/server/types/CryptoManager.java b/opends/src/server/org/opends/server/types/CryptoManager.java
index e5df041..3b1d0d4 100644
--- a/opends/src/server/org/opends/server/types/CryptoManager.java
+++ b/opends/src/server/org/opends/server/types/CryptoManager.java
@@ -247,9 +247,8 @@
         TRACER.debugCaught(DebugLogLevel.ERROR, ex);
       }
       throw new InitializationException(
-              // TODO: i18n
-              Message.raw("Cannot get preferred digest:  " +
-                      getExceptionMessage(ex).toString()), ex);
+              ERR_CRYPTOMGR_CANNOT_GET_PREFERRED_DIGEST.get(
+                      getExceptionMessage(ex)), ex);
     }
 
     // Preferred MAC engine and validation.
@@ -265,9 +264,8 @@
         TRACER.debugCaught(DebugLogLevel.ERROR, ex);
       }
       throw new InitializationException(
-              // TODO: i18n
-              Message.raw("Cannot get preferred MAC engine:  " +
-                          getExceptionMessage(ex).toString()), ex);
+              ERR_CRYPTOMGR_CANNOT_GET_PREFERRED_MAC_ENGINE.get(
+                      getExceptionMessage(ex)), ex);
     }
 
     // Preferred encryption cipher and validation.
@@ -283,9 +281,8 @@
         TRACER.debugCaught(DebugLogLevel.ERROR, ex);
       }
       throw new InitializationException(
-              // TODO: i18n
-            Message.raw("Cannot get preferred encryption cipher:  " +
-                      getExceptionMessage(ex).toString()), ex);
+             ERR_CRYPTOMGR_CANNOT_GET_PREFERRED_ENCRYPTION_CIPHER.get(
+                     getExceptionMessage(ex)), ex);
     }
 
 
@@ -322,9 +319,8 @@
         TRACER.debugCaught(DebugLogLevel.ERROR, ex);
       }
       throw new InitializationException(
-              // TODO: i18n
-             Message.raw("Cannot get preferred key wrapping cipher:  "
-                      + getExceptionMessage(ex).toString()), ex);
+           ERR_CRYPTOMGR_CANNOT_GET_PREFERRED_KEY_WRAPPING_CIPHER.get(
+                   getExceptionMessage(ex)), ex);
     }
 
     sslCertNickname = cfg.getSSLCertNickname();

--
Gitblit v1.10.0