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/FingerprintCertificateMapper.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
index 3a67521..a9dbe66 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
@@ -34,7 +34,7 @@
import java.util.*;
import javax.security.auth.x500.X500Principal;
import static org.opends.messages.ExtensionMessages.*;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.CertificateMapperCfg;
import org.opends.server.admin.std.server.FingerprintCertificateMapperCfg;
@@ -137,7 +137,7 @@
Backend b = DirectoryServer.getBackend(baseDN);
if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
{
- Message message = WARN_SATUACM_ATTR_UNINDEXED.get(
+ LocalizableMessage message = WARN_SATUACM_ATTR_UNINDEXED.get(
configuration.dn().toString(),
t.getNameOrOID(), b.getBackendID());
ErrorLogger.logError(message);
@@ -178,7 +178,7 @@
// Make sure that a peer certificate was provided.
if ((certificateChain == null) || (certificateChain.length == 0))
{
- Message message = ERR_FCM_NO_PEER_CERTIFICATE.get();
+ LocalizableMessage message = ERR_FCM_NO_PEER_CERTIFICATE.get();
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
@@ -196,7 +196,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_FCM_PEER_CERT_NOT_X509.get(
+ LocalizableMessage message = ERR_FCM_PEER_CERT_NOT_X509.get(
String.valueOf(certificateChain[0].getType()));
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
@@ -221,7 +221,7 @@
String peerSubject = peerCertificate.getSubjectX500Principal().getName(
X500Principal.RFC2253);
- Message message = ERR_FCM_CANNOT_CALCULATE_FINGERPRINT.get(
+ LocalizableMessage message = ERR_FCM_CANNOT_CALCULATE_FINGERPRINT.get(
peerSubject, getExceptionMessage(e));
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
@@ -268,7 +268,7 @@
case SIZE_LIMIT_EXCEEDED:
// Multiple entries matched the filter. This is not acceptable.
- Message message = ERR_FCM_MULTIPLE_SEARCH_MATCHING_ENTRIES.get(
+ LocalizableMessage message = ERR_FCM_MULTIPLE_SEARCH_MATCHING_ENTRIES.get(
fingerprintString);
throw new DirectoryException(
ResultCode.INVALID_CREDENTIALS, message);
@@ -300,7 +300,7 @@
}
else
{
- Message message = ERR_FCM_MULTIPLE_MATCHING_ENTRIES.
+ LocalizableMessage message = ERR_FCM_MULTIPLE_MATCHING_ENTRIES.
get(fingerprintString, String.valueOf(userEntry.getName()),
String.valueOf(entry.getName()));
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
@@ -321,7 +321,7 @@
*/
@Override()
public boolean isConfigurationAcceptable(CertificateMapperCfg configuration,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
FingerprintCertificateMapperCfg config =
(FingerprintCertificateMapperCfg) configuration;
@@ -336,7 +336,7 @@
@Override
public boolean isConfigurationChangeAcceptable(
FingerprintCertificateMapperCfg configuration,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
boolean configAcceptable = true;
@@ -354,7 +354,7 @@
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<Message> messages = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
// Get the algorithm that will be used to generate the fingerprint.
@@ -390,7 +390,7 @@
Backend b = DirectoryServer.getBackend(baseDN);
if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
{
- Message message = WARN_SATUACM_ATTR_UNINDEXED.get(
+ LocalizableMessage message = WARN_SATUACM_ATTR_UNINDEXED.get(
configuration.dn().toString(),
t.getNameOrOID(), b.getBackendID());
messages.add(message);
--
Gitblit v1.10.0