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/ExternalSASLMechanismHandler.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
index 5e8b2c2..7299f47 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
@@ -30,7 +30,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.ExternalSASLMechanismHandlerCfg;
import org.opends.server.admin.std.server.SASLMechanismHandlerCfg;
@@ -165,14 +165,14 @@
ClientConnection clientConnection = bindOperation.getClientConnection();
if (clientConnection == null) {
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
- Message message = ERR_SASLEXTERNAL_NO_CLIENT_CONNECTION.get();
+ LocalizableMessage message = ERR_SASLEXTERNAL_NO_CLIENT_CONNECTION.get();
bindOperation.setAuthFailureReason(message);
return;
}
if(!(clientConnection instanceof LDAPClientConnection)) {
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
- Message message = ERR_SASLEXTERNAL_NOT_LDAP_CLIENT_INSTANCE.get();
+ LocalizableMessage message = ERR_SASLEXTERNAL_NOT_LDAP_CLIENT_INSTANCE.get();
bindOperation.setAuthFailureReason(message);
return;
}
@@ -180,7 +180,7 @@
Certificate[] clientCertChain = lc.getClientCertificateChain();
if ((clientCertChain == null) || (clientCertChain.length == 0)) {
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
- Message message = ERR_SASLEXTERNAL_NO_CLIENT_CERT.get();
+ LocalizableMessage message = ERR_SASLEXTERNAL_NO_CLIENT_CERT.get();
bindOperation.setAuthFailureReason(message);
return;
}
@@ -217,7 +217,7 @@
{
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
- Message message = ERR_SASLEXTERNAL_NO_MAPPING.get();
+ LocalizableMessage message = ERR_SASLEXTERNAL_NO_MAPPING.get();
bindOperation.setAuthFailureReason(message);
return;
}
@@ -240,7 +240,7 @@
{
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
- Message message = ERR_SASLEXTERNAL_NO_CERT_IN_ENTRY.get(
+ LocalizableMessage message = ERR_SASLEXTERNAL_NO_CERT_IN_ENTRY.get(
String.valueOf(userEntry.getName()));
bindOperation.setAuthFailureReason(message);
return;
@@ -269,7 +269,7 @@
{
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
- Message message = ERR_SASLEXTERNAL_PEER_CERT_NOT_FOUND.get(
+ LocalizableMessage message = ERR_SASLEXTERNAL_PEER_CERT_NOT_FOUND.get(
String.valueOf(userEntry.getName()));
bindOperation.setAuthFailureReason(message);
return;
@@ -284,7 +284,7 @@
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
- Message message = ERR_SASLEXTERNAL_CANNOT_VALIDATE_CERT.get(
+ LocalizableMessage message = ERR_SASLEXTERNAL_CANNOT_VALIDATE_CERT.get(
String.valueOf(userEntry.getName()),
getExceptionMessage(e));
bindOperation.setAuthFailureReason(message);
@@ -317,7 +317,7 @@
{
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
- Message message = ERR_SASLEXTERNAL_PEER_CERT_NOT_FOUND.get(
+ LocalizableMessage message = ERR_SASLEXTERNAL_PEER_CERT_NOT_FOUND.get(
String.valueOf(userEntry.getName()));
bindOperation.setAuthFailureReason(message);
return;
@@ -332,7 +332,7 @@
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
- Message message = ERR_SASLEXTERNAL_CANNOT_VALIDATE_CERT.get(
+ LocalizableMessage message = ERR_SASLEXTERNAL_CANNOT_VALIDATE_CERT.get(
String.valueOf(userEntry.getName()),
getExceptionMessage(e));
bindOperation.setAuthFailureReason(message);
@@ -380,7 +380,7 @@
@Override()
public boolean isConfigurationAcceptable(
SASLMechanismHandlerCfg configuration,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
ExternalSASLMechanismHandlerCfg config =
(ExternalSASLMechanismHandlerCfg) configuration;
@@ -394,7 +394,7 @@
*/
public boolean isConfigurationChangeAcceptable(
ExternalSASLMechanismHandlerCfg configuration,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
return true;
}
@@ -409,7 +409,7 @@
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<Message> messages = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
// See if we should attempt to validate client certificates against those in
--
Gitblit v1.10.0