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/tools/LDAPConnection.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java
index 3e49937..8046fde 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java
@@ -35,7 +35,7 @@
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicInteger;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.controls.AuthorizationIdentityResponseControl;
import org.opends.server.controls.PasswordExpiringControl;
import org.opends.server.controls.PasswordPolicyErrorType;
@@ -212,7 +212,7 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
- throw new LDAPConnectionException(Message.raw(ex.getMessage()), ex);
+ throw new LDAPConnectionException(LocalizableMessage.raw(ex.getMessage()), ex);
}
// Send the StartTLS extended request.
@@ -233,7 +233,7 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, ex1);
}
- throw new LDAPConnectionException(Message.raw(ex1.getMessage()), ex1
+ throw new LDAPConnectionException(LocalizableMessage.raw(ex1.getMessage()), ex1
.getResultCode(), null, ex1);
} catch (Exception ex1)
{
@@ -241,7 +241,7 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, ex1);
}
- throw new LDAPConnectionException(Message.raw(ex1.getMessage()), ex1);
+ throw new LDAPConnectionException(LocalizableMessage.raw(ex1.getMessage()), ex1);
}
ExtendedResponseProtocolOp res = msg.getExtendedResponseProtocolOp();
resultCode = res.getResultCode();
@@ -262,12 +262,12 @@
ldapReader = new LDAPReader(socket);
} catch(UnknownHostException uhe)
{
- Message msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
+ LocalizableMessage msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
throw new LDAPConnectionException(msg, CLIENT_SIDE_CONNECT_ERROR, null,
uhe);
} catch(ConnectException ce)
{
- Message msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
+ LocalizableMessage msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
throw new LDAPConnectionException(msg, CLIENT_SIDE_CONNECT_ERROR, null,
ce);
} catch (LDAPConnectionException e)
@@ -279,7 +279,7 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, ex2);
}
- throw new LDAPConnectionException(Message.raw(ex2.getMessage()), ex2);
+ throw new LDAPConnectionException(LocalizableMessage.raw(ex2.getMessage()), ex2);
}
// We need this so that we don't run out of addresses when the tool
@@ -376,7 +376,7 @@
control = (AuthorizationIdentityResponseControl)c;
}
- Message message =
+ LocalizableMessage message =
INFO_BIND_AUTHZID_RETURNED.get(
control.getAuthorizationID());
out.println(message);
@@ -384,7 +384,7 @@
else if (c.getOID().equals(OID_NS_PASSWORD_EXPIRED))
{
- Message message = INFO_BIND_PASSWORD_EXPIRED.get();
+ LocalizableMessage message = INFO_BIND_PASSWORD_EXPIRED.get();
out.println(message);
}
else if (c.getOID().equals(OID_NS_PASSWORD_EXPIRING))
@@ -401,11 +401,11 @@
// Control should already have been decoded.
control = (PasswordExpiringControl)c;
}
- Message timeString =
+ LocalizableMessage timeString =
secondsToTimeString(control.getSecondsUntilExpiration());
- Message message = INFO_BIND_PASSWORD_EXPIRING.get(timeString);
+ LocalizableMessage message = INFO_BIND_PASSWORD_EXPIRING.get(timeString);
out.println(message);
}
else if (c.getOID().equals(OID_PASSWORD_POLICY_CONTROL))
@@ -429,7 +429,7 @@
{
case PASSWORD_EXPIRED:
- Message message = INFO_BIND_PASSWORD_EXPIRED.get();
+ LocalizableMessage message = INFO_BIND_PASSWORD_EXPIRED.get();
out.println(message);
break;
case ACCOUNT_LOCKED:
@@ -452,11 +452,11 @@
switch (warningType)
{
case TIME_BEFORE_EXPIRATION:
- Message timeString =
+ LocalizableMessage timeString =
secondsToTimeString(pwPolicyControl.getWarningValue());
- Message message = INFO_BIND_PASSWORD_EXPIRING.get(timeString);
+ LocalizableMessage message = INFO_BIND_PASSWORD_EXPIRING.get(timeString);
out.println(message);
break;
case GRACE_LOGINS_REMAINING:
@@ -495,7 +495,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
throw new LDAPConnectionException(
- Message.raw(ex.getLocalizedMessage()),ex);
+ LocalizableMessage.raw(ex.getLocalizedMessage()),ex);
}
finally
{
@@ -554,7 +554,7 @@
}
catch (UnknownHostException uhe)
{
- Message msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
+ LocalizableMessage msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
throw new LDAPConnectionException(msg, CLIENT_SIDE_CONNECT_ERROR, null,
uhe);
}
@@ -566,11 +566,11 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
- throw new LDAPConnectionException(Message.raw(ex.getMessage()), ex);
+ throw new LDAPConnectionException(LocalizableMessage.raw(ex.getMessage()), ex);
}
if (ce != null)
{
- Message msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
+ LocalizableMessage msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
throw new LDAPConnectionException(msg, CLIENT_SIDE_CONNECT_ERROR, null,
ce);
}
@@ -614,7 +614,7 @@
}
catch (UnknownHostException uhe)
{
- Message msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
+ LocalizableMessage msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
throw new LDAPConnectionException(msg, CLIENT_SIDE_CONNECT_ERROR, null,
uhe);
}
@@ -626,11 +626,11 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
- throw new LDAPConnectionException(Message.raw(ex.getMessage()), ex);
+ throw new LDAPConnectionException(LocalizableMessage.raw(ex.getMessage()), ex);
}
if (ce != null)
{
- Message msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
+ LocalizableMessage msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
throw new LDAPConnectionException(msg, CLIENT_SIDE_CONNECT_ERROR, null,
ce);
}
@@ -674,7 +674,7 @@
}
catch (IOException e)
{
- Message msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
+ LocalizableMessage msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
throw new LDAPConnectionException(msg, CLIENT_SIDE_CONNECT_ERROR, null,
e);
}
--
Gitblit v1.10.0