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/FileBasedKeyManagerProvider.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
index 730fe12..3d251a3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.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;
@@ -124,7 +124,7 @@
try {
File f = getFileForPath(keyStoreFile);
if (!(f.exists() && f.isFile())) {
- Message message = ERR_FILE_KEYMANAGER_NO_SUCH_FILE.get(
+ LocalizableMessage message = ERR_FILE_KEYMANAGER_NO_SUCH_FILE.get(
String.valueOf(keyStoreFile), String.valueOf(configEntryDN));
throw new InitializationException(message);
}
@@ -134,7 +134,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_FILE.get(
+ LocalizableMessage message = ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_FILE.get(
String.valueOf(configEntryDN), getExceptionMessage(e));
throw new InitializationException(message, e);
}
@@ -151,7 +151,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, kse);
}
- Message message = ERR_FILE_KEYMANAGER_INVALID_TYPE.
+ LocalizableMessage message = ERR_FILE_KEYMANAGER_INVALID_TYPE.
get(String.valueOf(configuration.getKeyStoreType()),
String.valueOf(configEntryDN), getExceptionMessage(kse));
throw new InitializationException(message);
@@ -178,7 +178,7 @@
String pinStr = System.getProperty(propertyName);
if (pinStr == null) {
- Message message = ERR_FILE_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
+ LocalizableMessage message = ERR_FILE_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
String.valueOf(propertyName), String.valueOf(configEntryDN));
throw new InitializationException(message);
}
@@ -190,7 +190,7 @@
String pinStr = System.getenv(enVarName);
if (pinStr == null) {
- Message message = ERR_FILE_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
+ LocalizableMessage message = ERR_FILE_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
String.valueOf(enVarName), String.valueOf(configEntryDN));
throw new InitializationException(message);
}
@@ -201,7 +201,7 @@
File pinFile = getFileForPath(fileName);
if (!pinFile.exists()) {
- Message message = ERR_FILE_KEYMANAGER_PIN_NO_SUCH_FILE.get(
+ LocalizableMessage message = ERR_FILE_KEYMANAGER_PIN_NO_SUCH_FILE.get(
String.valueOf(fileName), String.valueOf(configEntryDN));
throw new InitializationException(message);
}
@@ -213,14 +213,14 @@
pinStr = br.readLine();
br.close();
} catch (IOException ioe) {
- Message message = ERR_FILE_KEYMANAGER_PIN_FILE_CANNOT_READ.
+ LocalizableMessage message = ERR_FILE_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_FILE_KEYMANAGER_PIN_FILE_EMPTY.get(
+ LocalizableMessage message = ERR_FILE_KEYMANAGER_PIN_FILE_EMPTY.get(
String.valueOf(fileName), String.valueOf(configEntryDN));
throw new InitializationException(message);
}
@@ -274,7 +274,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_FILE_KEYMANAGER_CANNOT_LOAD.get(
+ LocalizableMessage message = ERR_FILE_KEYMANAGER_CANNOT_LOAD.get(
keyStoreFile, getExceptionMessage(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
@@ -296,7 +296,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_FILE_KEYMANAGER_CANNOT_CREATE_FACTORY.get(
+ LocalizableMessage message = ERR_FILE_KEYMANAGER_CANNOT_CREATE_FACTORY.get(
keyStoreFile, getExceptionMessage(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
@@ -311,7 +311,7 @@
@Override()
public boolean isConfigurationAcceptable(
FileBasedKeyManagerProviderCfg configuration,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
return isConfigurationChangeAcceptable(configuration, unacceptableReasons);
}
@@ -323,7 +323,7 @@
*/
public boolean isConfigurationChangeAcceptable(
FileBasedKeyManagerProviderCfg configuration,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
boolean configAcceptable = true;
DN cfgEntryDN = configuration.dn();
@@ -485,7 +485,7 @@
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<Message> messages = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
// Get the path to the key store file.
--
Gitblit v1.10.0