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/controls/ProxiedAuthV2Control.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV2Control.java b/opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
index ec19049..3f1a0fe 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
@@ -29,7 +29,7 @@
import java.io.IOException;
import java.util.concurrent.locks.Lock;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.AuthenticationPolicyState;
import org.opends.server.api.IdentityMapper;
import org.opends.server.core.DirectoryServer;
@@ -72,13 +72,13 @@
{
if (!isCritical)
{
- Message message = ERR_PROXYAUTH2_CONTROL_NOT_CRITICAL.get();
+ LocalizableMessage message = ERR_PROXYAUTH2_CONTROL_NOT_CRITICAL.get();
throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
}
if (value == null)
{
- Message message = ERR_PROXYAUTH2_NO_CONTROL_VALUE.get();
+ LocalizableMessage message = ERR_PROXYAUTH2_NO_CONTROL_VALUE.get();
throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
}
@@ -103,7 +103,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message =
+ LocalizableMessage message =
ERR_PROXYAUTH2_INVALID_AUTHZID.get(lowerAuthZIDStr);
throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message,
e);
@@ -258,7 +258,7 @@
if (userEntry == null)
{
// The requested user does not exist.
- Message message = ERR_PROXYAUTH2_NO_SUCH_USER.get(lowerAuthzID);
+ LocalizableMessage message = ERR_PROXYAUTH2_NO_SUCH_USER.get(lowerAuthzID);
throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED,
message);
}
@@ -291,14 +291,14 @@
DirectoryServer.getProxiedAuthorizationIdentityMapper();
if (proxyMapper == null)
{
- Message message = ERR_PROXYAUTH2_NO_IDENTITY_MAPPER.get();
+ LocalizableMessage message = ERR_PROXYAUTH2_NO_IDENTITY_MAPPER.get();
throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED, message);
}
Entry userEntry = proxyMapper.getEntryForID(lowerAuthzID.substring(2));
if (userEntry == null)
{
- Message message = ERR_PROXYAUTH2_NO_SUCH_USER.get(lowerAuthzID);
+ LocalizableMessage message = ERR_PROXYAUTH2_NO_SUCH_USER.get(lowerAuthzID);
throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED, message);
}
else
@@ -312,7 +312,7 @@
}
else
{
- Message message = ERR_PROXYAUTH2_INVALID_AUTHZID.get(lowerAuthzID);
+ LocalizableMessage message = ERR_PROXYAUTH2_INVALID_AUTHZID.get(lowerAuthzID);
throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
}
}
@@ -327,7 +327,7 @@
if (state.isDisabled())
{
- Message message = ERR_PROXYAUTH2_UNUSABLE_ACCOUNT.get(String
+ LocalizableMessage message = ERR_PROXYAUTH2_UNUSABLE_ACCOUNT.get(String
.valueOf(userEntry.getName()));
throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED, message);
}
@@ -341,7 +341,7 @@
pwpState.lockedDueToMaximumResetAge() ||
pwpState.isPasswordExpired())
{
- Message message = ERR_PROXYAUTH2_UNUSABLE_ACCOUNT.get(String
+ LocalizableMessage message = ERR_PROXYAUTH2_UNUSABLE_ACCOUNT.get(String
.valueOf(userEntry.getName()));
throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED,
message);
--
Gitblit v1.10.0