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/CryptoManagerImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
index e4b7fa3..d516bad 100644
--- a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
@@ -27,7 +27,7 @@
*/
package org.opends.server.crypto;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.CoreMessages.*;
import java.io.InputStream;
@@ -279,7 +279,7 @@
}
// CryptoMangager crypto config parameters.
- List<Message> why = new LinkedList<Message>();
+ List<LocalizableMessage> why = new LinkedList<LocalizableMessage>();
if (! isConfigurationChangeAcceptable(cfg, why)) {
throw new InitializationException(why.get(0));
}
@@ -301,7 +301,7 @@
*/
public boolean isConfigurationChangeAcceptable(
CryptoManagerCfg cfg,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
// Acceptable until we find an error.
boolean isAcceptable = true;
@@ -443,7 +443,7 @@
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- List<Message> messages = new ArrayList<Message>();
+ List<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
preferredDigestAlgorithm = cfg.getDigestAlgorithm();
preferredMACAlgorithm = cfg.getMacAlgorithm();
@@ -468,14 +468,14 @@
ConfigConstants.ID_ADS_TRUST_STORE_BACKEND);
if (b == null)
{
- Message msg =
+ LocalizableMessage msg =
ERR_CRYPTOMGR_ADS_TRUST_STORE_BACKEND_NOT_ENABLED.get(
ConfigConstants.ID_ADS_TRUST_STORE_BACKEND);
throw new ConfigException(msg);
}
if (!(b instanceof TrustStoreBackend))
{
- Message msg =
+ LocalizableMessage msg =
ERR_CRYPTOMGR_ADS_TRUST_STORE_BACKEND_WRONG_CLASS.get(
ConfigConstants.ID_ADS_TRUST_STORE_BACKEND);
throw new ConfigException(msg);
@@ -575,10 +575,10 @@
ERR_CRYPTOMGR_FAILED_TO_RETRIEVE_INSTANCE_CERTIFICATE.get(
entryDN.toString(), getExceptionMessage(ex)), ex);
}
- //The certificate can never be null. The Message digest code that will
+ //The certificate can never be null. The LocalizableMessage digest code that will
//use it later throws a NPE if the certificate is null.
if(certificate == null) {
- Message msg =
+ LocalizableMessage msg =
ERR_CRYPTOMGR_FAILED_INSTANCE_CERTIFICATE_NULL.get(entryDN.toString());
throw new CryptoManagerException(msg);
}
@@ -3067,7 +3067,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message =
+ LocalizableMessage message =
ERR_CRYPTOMGR_SSL_CONTEXT_CANNOT_INITIALIZE.get(
getExceptionMessage(e));
throw new ConfigException(message, e);
--
Gitblit v1.10.0