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/extensions/PKCS11KeyManagerProvider.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
index 64d85bf..1cea765 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
@@ -22,10 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.extensions;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
@@ -136,7 +136,7 @@
String pinStr = System.getProperty(propertyName);
if (pinStr == null) {
- Message message = ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
+ LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
String.valueOf(propertyName), String.valueOf(configEntryDN));
throw new InitializationException(message);
}
@@ -148,7 +148,7 @@
String pinStr = System.getenv(enVarName);
if (pinStr == null) {
- Message message = ERR_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
+ LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
String.valueOf(enVarName), String.valueOf(configEntryDN));
throw new InitializationException(message);
}
@@ -159,7 +159,7 @@
File pinFile = getFileForPath(fileName);
if (!pinFile.exists()) {
- Message message = ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(
+ LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(
String.valueOf(fileName), String.valueOf(configEntryDN));
throw new InitializationException(message);
}
@@ -176,14 +176,14 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ioe);
}
- Message message = ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ.
+ LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ.
get(String.valueOf(fileName), String.valueOf(configEntryDN),
getExceptionMessage(ioe));
throw new InitializationException(message, ioe);
}
if (pinStr == null) {
- Message message = ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(
+ LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(
String.valueOf(fileName), String.valueOf(configEntryDN));
throw new InitializationException(message);
}
@@ -233,7 +233,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message =
+ LocalizableMessage message =
ERR_PKCS11_KEYMANAGER_CANNOT_LOAD.get(getExceptionMessage(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
@@ -255,7 +255,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_PKCS11_KEYMANAGER_CANNOT_CREATE_FACTORY.get(
+ LocalizableMessage message = ERR_PKCS11_KEYMANAGER_CANNOT_CREATE_FACTORY.get(
getExceptionMessage(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
@@ -270,7 +270,7 @@
@Override()
public boolean isConfigurationAcceptable(
PKCS11KeyManagerProviderCfg configuration,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
return isConfigurationChangeAcceptable(configuration, unacceptableReasons);
}
@@ -282,7 +282,7 @@
*/
public boolean isConfigurationChangeAcceptable(
PKCS11KeyManagerProviderCfg configuration,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
boolean configAcceptable = true;
DN cfgEntryDN = configuration.dn();
@@ -401,7 +401,7 @@
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<Message> messages = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
// Get the PIN needed to access the contents of the keystore file.
--
Gitblit v1.10.0