From cfc513043c5830b5a967733066068c7097b42e3c Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.
---
opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java | 141 +++++++++++++++++++++++-----------------------
1 files changed, 70 insertions(+), 71 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
index 54a8616..1278a42 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.extensions;
+import org.opends.messages.Message;
@@ -50,12 +51,11 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
-import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
-import static org.opends.server.messages.ExtensionsMessages.*;
-import static org.opends.server.messages.MessageHandler.*;
+import static org.opends.messages.ExtensionMessages.*;
+
import static org.opends.server.util.StaticUtils.*;
@@ -136,10 +136,9 @@
String pinStr = System.getProperty(propertyName);
if (pinStr == null) {
- int msgID = MSGID_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET;
- String message = getMessage(msgID, String
- .valueOf(propertyName), String.valueOf(configEntryDN));
- throw new InitializationException(msgID, message);
+ Message message = ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
+ String.valueOf(propertyName), String.valueOf(configEntryDN));
+ throw new InitializationException(message);
}
keyStorePIN = pinStr.toCharArray();
@@ -149,10 +148,9 @@
String pinStr = System.getenv(enVarName);
if (pinStr == null) {
- int msgID = MSGID_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET;
- String message = getMessage(msgID, String.valueOf(enVarName),
- String.valueOf(configEntryDN));
- throw new InitializationException(msgID, message);
+ Message message = ERR_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
+ String.valueOf(enVarName), String.valueOf(configEntryDN));
+ throw new InitializationException(message);
}
keyStorePIN = pinStr.toCharArray();
@@ -161,10 +159,9 @@
File pinFile = getFileForPath(fileName);
if (!pinFile.exists()) {
- int msgID = MSGID_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE;
- String message = getMessage(msgID, String.valueOf(fileName),
- String.valueOf(configEntryDN));
- throw new InitializationException(msgID, message);
+ Message message = ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(
+ String.valueOf(fileName), String.valueOf(configEntryDN));
+ throw new InitializationException(message);
}
String pinStr;
@@ -179,17 +176,16 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ioe);
}
- int msgID = MSGID_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ;
- String message = getMessage(msgID, String.valueOf(fileName),
- String.valueOf(configEntryDN), getExceptionMessage(ioe));
- throw new InitializationException(msgID, message, ioe);
+ Message 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) {
- int msgID = MSGID_PKCS11_KEYMANAGER_PIN_FILE_EMPTY;
- String message = getMessage(msgID, String.valueOf(fileName),
- String.valueOf(configEntryDN));
- throw new InitializationException(msgID, message);
+ Message message = ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(
+ String.valueOf(fileName), String.valueOf(configEntryDN));
+ throw new InitializationException(message);
}
keyStorePIN = pinStr.toCharArray();
@@ -197,9 +193,9 @@
keyStorePIN = configuration.getKeyStorePin().toCharArray();
} else {
// Pin wasn't defined anywhere.
- int msgID = MSGID_PKCS11_KEYMANAGER_NO_PIN;
- String message = getMessage(msgID, String.valueOf(configEntryDN));
- throw new ConfigException(msgID, message);
+ Message message =
+ ERR_PKCS11_KEYMANAGER_NO_PIN.get(String.valueOf(configEntryDN));
+ throw new ConfigException(message);
}
}
@@ -242,10 +238,10 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_LOAD;
- String message = getMessage(msgID, getExceptionMessage(e));
+ Message message =
+ ERR_PKCS11_KEYMANAGER_CANNOT_LOAD.get(getExceptionMessage(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message, msgID, e);
+ message, e);
}
@@ -264,10 +260,10 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_CREATE_FACTORY;
- String message = getMessage(msgID, getExceptionMessage(e));
+ Message message = ERR_PKCS11_KEYMANAGER_CANNOT_CREATE_FACTORY.get(
+ getExceptionMessage(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message, msgID, e);
+ message, e);
}
}
@@ -278,7 +274,7 @@
*/
@Override()
public boolean isConfigurationAcceptable(KeyManagerCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
PKCS11KeyManagerCfg config = (PKCS11KeyManagerCfg) configuration;
return isConfigurationChangeAcceptable(config, unacceptableReasons);
@@ -291,7 +287,7 @@
*/
public boolean isConfigurationChangeAcceptable(
PKCS11KeyManagerCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
boolean configAcceptable = true;
DN cfgEntryDN = configuration.dn();
@@ -315,9 +311,9 @@
if (pinStr == null)
{
- int msgID = MSGID_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET;
- unacceptableReasons.add(getMessage(msgID, String.valueOf(propertyName),
- String.valueOf(cfgEntryDN)));
+ unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
+ String.valueOf(propertyName),
+ String.valueOf(cfgEntryDN)));
configAcceptable = false;
}
}
@@ -328,9 +324,9 @@
if (pinStr == null)
{
- int msgID = MSGID_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET;
- unacceptableReasons.add(getMessage(msgID, String.valueOf(enVarName),
- String.valueOf(cfgEntryDN)));
+ unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
+ String.valueOf(enVarName),
+ String.valueOf(cfgEntryDN)));
configAcceptable = false;
}
}
@@ -341,9 +337,9 @@
if (!pinFile.exists())
{
- int msgID = MSGID_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE;
- unacceptableReasons.add(getMessage(msgID, String.valueOf(fileName),
- String.valueOf(cfgEntryDN)));
+ unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(
+ String.valueOf(fileName),
+ String.valueOf(cfgEntryDN)));
configAcceptable = false;
}
else
@@ -356,10 +352,11 @@
}
catch (IOException ioe)
{
- int msgID = MSGID_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ;
- unacceptableReasons.add(getMessage(msgID, String.valueOf(fileName),
- String.valueOf(cfgEntryDN),
- getExceptionMessage(ioe)));
+ unacceptableReasons.add(
+ ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ.get(
+ String.valueOf(fileName),
+ String.valueOf(cfgEntryDN),
+ getExceptionMessage(ioe)));
configAcceptable = false;
}
finally
@@ -372,9 +369,10 @@
if (pinStr == null)
{
- int msgID = MSGID_PKCS11_KEYMANAGER_PIN_FILE_EMPTY;
- unacceptableReasons.add(getMessage(msgID, String.valueOf(fileName),
- String.valueOf(cfgEntryDN)));
+
+ unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(
+ String.valueOf(fileName),
+ String.valueOf(cfgEntryDN)));
configAcceptable = false;
}
}
@@ -386,8 +384,8 @@
else
{
// Pin wasn't defined anywhere.
- int msgID = MSGID_PKCS11_KEYMANAGER_NO_PIN;
- unacceptableReasons.add(getMessage(msgID, String.valueOf(cfgEntryDN)));
+ unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_NO_PIN.get(
+ String.valueOf(cfgEntryDN)));
configAcceptable = false;
}
@@ -404,7 +402,7 @@
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
// Get the PIN needed to access the contents of the keystore file.
@@ -429,9 +427,9 @@
{
resultCode = DirectoryServer.getServerErrorResultCode();
- int msgID = MSGID_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET;
- messages.add(getMessage(msgID, String.valueOf(propertyName),
- String.valueOf(configEntryDN)));
+ messages.add(ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
+ String.valueOf(propertyName),
+ String.valueOf(configEntryDN)));
}
else
{
@@ -447,9 +445,9 @@
{
resultCode = DirectoryServer.getServerErrorResultCode();
- int msgID = MSGID_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET;
- messages.add(getMessage(msgID, String.valueOf(enVarName),
- String.valueOf(configEntryDN)));
+ messages.add(ERR_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
+ String.valueOf(enVarName),
+ String.valueOf(configEntryDN)));
}
else
{
@@ -465,9 +463,9 @@
{
resultCode = DirectoryServer.getServerErrorResultCode();
- int msgID = MSGID_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE;
- messages.add(getMessage(msgID, String.valueOf(fileName),
- String.valueOf(configEntryDN)));
+ messages.add(ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(
+ String.valueOf(fileName),
+ String.valueOf(configEntryDN)));
}
else
{
@@ -481,10 +479,10 @@
{
resultCode = DirectoryServer.getServerErrorResultCode();
- int msgID = MSGID_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ;
- messages.add(getMessage(msgID, String.valueOf(fileName),
- String.valueOf(configEntryDN),
- getExceptionMessage(ioe)));
+ messages.add(ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ.get(
+ String.valueOf(fileName),
+ String.valueOf(configEntryDN),
+ getExceptionMessage(ioe)));
}
finally
{
@@ -498,9 +496,9 @@
{
resultCode = DirectoryServer.getServerErrorResultCode();
- int msgID = MSGID_PKCS11_KEYMANAGER_PIN_FILE_EMPTY;
- messages.add(getMessage(msgID, String.valueOf(fileName),
- String.valueOf(configEntryDN)));
+ messages.add(ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(
+ String.valueOf(fileName),
+ String.valueOf(configEntryDN)));
}
else
{
@@ -517,8 +515,9 @@
// Pin wasn't defined anywhere.
resultCode = DirectoryServer.getServerErrorResultCode();
- int msgID = MSGID_PKCS11_KEYMANAGER_NO_PIN;
- messages.add(getMessage(msgID, String.valueOf(configEntryDN)));
+
+ messages.add(ERR_PKCS11_KEYMANAGER_NO_PIN.get(
+ String.valueOf(configEntryDN)));
}
--
Gitblit v1.10.0