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/LDAPAuthenticationHandler.java | 408 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 204 insertions(+), 204 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
index 8d7323d..0d777b1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
@@ -25,7 +25,7 @@
* Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.tools;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
@@ -209,7 +209,7 @@
* specified SASL mechanism, mapped from the property names to their
* corresponding descriptions.
*/
- public static LinkedHashMap<String,Message> getSASLProperties(
+ public static LinkedHashMap<String,LocalizableMessage> getSASLProperties(
String mechanism)
{
String upperName = toUpperCase(mechanism);
@@ -310,14 +310,14 @@
}
catch (IOException ioe)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_SEND_SIMPLE_BIND.get(getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (Exception e)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_SEND_SIMPLE_BIND.get(getExceptionMessage(e));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_ENCODING_ERROR,
message, e);
@@ -331,7 +331,7 @@
responseMessage = reader.readMessage();
if (responseMessage == null)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CONNECTION_CLOSED_WITHOUT_BIND_RESPONSE.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_SERVER_DOWN,
message);
@@ -339,28 +339,28 @@
}
catch (IOException ioe)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (ASN1Exception ae)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, ae);
}
catch (LDAPException le)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(le));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, le);
}
catch (Exception e)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -392,21 +392,21 @@
if ((responseOID != null) &&
responseOID.equals(OID_NOTICE_OF_DISCONNECTION))
{
- Message message = ERR_LDAPAUTH_SERVER_DISCONNECT.
+ LocalizableMessage message = ERR_LDAPAUTH_SERVER_DISCONNECT.
get(extendedResponse.getResultCode(),
extendedResponse.getErrorMessage());
throw new LDAPException(extendedResponse.getResultCode(), message);
}
else
{
- Message message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
String.valueOf(extendedResponse));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message);
}
default:
- Message message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
String.valueOf(responseMessage.getProtocolOp()));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
@@ -425,7 +425,7 @@
// FIXME -- Add support for referrals.
- Message message = ERR_LDAPAUTH_SIMPLE_BIND_FAILED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_SIMPLE_BIND_FAILED.get();
throw new LDAPException(resultCode, bindResponse.getErrorMessage(),
message, bindResponse.getMatchedDN(), null);
}
@@ -479,7 +479,7 @@
if ((mechanism == null) || (mechanism.length() == 0))
{
- Message message = ERR_LDAPAUTH_NO_SASL_MECHANISM.get();
+ LocalizableMessage message = ERR_LDAPAUTH_NO_SASL_MECHANISM.get();
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_PARAM_ERROR, message);
}
@@ -520,7 +520,7 @@
}
else
{
- Message message = ERR_LDAPAUTH_UNSUPPORTED_SASL_MECHANISM.get(mechanism);
+ LocalizableMessage message = ERR_LDAPAUTH_UNSUPPORTED_SASL_MECHANISM.get(mechanism);
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_AUTH_UNKNOWN, message);
}
@@ -584,7 +584,7 @@
if (iterator.hasNext())
{
- Message message = ERR_LDAPAUTH_TRACE_SINGLE_VALUED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_TRACE_SINGLE_VALUED.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -592,7 +592,7 @@
}
else
{
- Message message = ERR_LDAPAUTH_INVALID_SASL_PROPERTY.get(
+ LocalizableMessage message = ERR_LDAPAUTH_INVALID_SASL_PROPERTY.get(
name, SASL_MECHANISM_ANONYMOUS);
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
@@ -625,14 +625,14 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
SASL_MECHANISM_ANONYMOUS, getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
SASL_MECHANISM_ANONYMOUS, getExceptionMessage(e));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_ENCODING_ERROR,
message, e);
@@ -646,7 +646,7 @@
responseMessage = reader.readMessage();
if (responseMessage == null)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CONNECTION_CLOSED_WITHOUT_BIND_RESPONSE.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_SERVER_DOWN,
message);
@@ -654,28 +654,28 @@
}
catch (IOException ioe)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (ASN1Exception ae)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, ae);
}
catch (LDAPException le)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(le));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, le);
}
catch (Exception e)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -707,21 +707,21 @@
if ((responseOID != null) &&
responseOID.equals(OID_NOTICE_OF_DISCONNECTION))
{
- Message message = ERR_LDAPAUTH_SERVER_DISCONNECT.
+ LocalizableMessage message = ERR_LDAPAUTH_SERVER_DISCONNECT.
get(extendedResponse.getResultCode(),
extendedResponse.getErrorMessage());
throw new LDAPException(extendedResponse.getResultCode(), message);
}
else
{
- Message message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
String.valueOf(extendedResponse));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message);
}
default:
- Message message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
String.valueOf(responseMessage.getProtocolOp()));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message);
@@ -740,7 +740,7 @@
// FIXME -- Add support for referrals.
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_SASL_BIND_FAILED.get(SASL_MECHANISM_ANONYMOUS);
throw new LDAPException(resultCode, bindResponse.getErrorMessage(),
message, bindResponse.getMatchedDN(), null);
@@ -757,10 +757,10 @@
* SASL ANONYMOUS bind, mapped from the property names to their
* corresponding descriptions.
*/
- public static LinkedHashMap<String, Message> getSASLAnonymousProperties()
+ public static LinkedHashMap<String, LocalizableMessage> getSASLAnonymousProperties()
{
- LinkedHashMap<String,Message> properties =
- new LinkedHashMap<String,Message>(1);
+ LinkedHashMap<String,LocalizableMessage> properties =
+ new LinkedHashMap<String,LocalizableMessage>(1);
properties.put(SASL_PROPERTY_TRACE,
INFO_LDAPAUTH_PROPERTY_DESCRIPTION_TRACE.get());
@@ -809,7 +809,7 @@
// properties are allowed.
if ((saslProperties == null) || saslProperties.isEmpty())
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_NO_SASL_PROPERTIES.get(SASL_MECHANISM_CRAM_MD5);
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_PARAM_ERROR, message);
@@ -831,7 +831,7 @@
if (iterator.hasNext())
{
- Message message = ERR_LDAPAUTH_AUTHID_SINGLE_VALUED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_AUTHID_SINGLE_VALUED.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -839,7 +839,7 @@
}
else
{
- Message message = ERR_LDAPAUTH_INVALID_SASL_PROPERTY.get(
+ LocalizableMessage message = ERR_LDAPAUTH_INVALID_SASL_PROPERTY.get(
name, SASL_MECHANISM_CRAM_MD5);
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_PARAM_ERROR, message);
@@ -850,7 +850,7 @@
// Make sure that the authID was provided.
if ((authID == null) || (authID.length() == 0))
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_SASL_AUTHID_REQUIRED.get(SASL_MECHANISM_CRAM_MD5);
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_PARAM_ERROR, message);
@@ -881,14 +881,14 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_INITIAL_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_INITIAL_SASL_BIND.get(
SASL_MECHANISM_CRAM_MD5, getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_INITIAL_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_INITIAL_SASL_BIND.get(
SASL_MECHANISM_CRAM_MD5, getExceptionMessage(e));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_ENCODING_ERROR,
message, e);
@@ -902,7 +902,7 @@
responseMessage1 = reader.readMessage();
if (responseMessage1 == null)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CONNECTION_CLOSED_WITHOUT_BIND_RESPONSE.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_SERVER_DOWN,
message);
@@ -910,28 +910,28 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
SASL_MECHANISM_CRAM_MD5, getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (ASN1Exception ae)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
SASL_MECHANISM_CRAM_MD5, getExceptionMessage(ae));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, ae);
}
catch (LDAPException le)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
SASL_MECHANISM_CRAM_MD5, getExceptionMessage(le));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, le);
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
SASL_MECHANISM_CRAM_MD5, getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -954,21 +954,21 @@
if ((responseOID != null) &&
responseOID.equals(OID_NOTICE_OF_DISCONNECTION))
{
- Message message = ERR_LDAPAUTH_SERVER_DISCONNECT.
+ LocalizableMessage message = ERR_LDAPAUTH_SERVER_DISCONNECT.
get(extendedResponse.getResultCode(),
extendedResponse.getErrorMessage());
throw new LDAPException(extendedResponse.getResultCode(), message);
}
else
{
- Message message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
String.valueOf(extendedResponse));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message);
}
default:
- Message message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
String.valueOf(responseMessage1.getProtocolOp()));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
@@ -982,13 +982,13 @@
int resultCode1 = bindResponse1.getResultCode();
if (resultCode1 != LDAPResultCode.SASL_BIND_IN_PROGRESS)
{
- Message errorMessage = bindResponse1.getErrorMessage();
+ LocalizableMessage errorMessage = bindResponse1.getErrorMessage();
if (errorMessage == null)
{
- errorMessage = Message.EMPTY;
+ errorMessage = LocalizableMessage.EMPTY;
}
- Message message = ERR_LDAPAUTH_UNEXPECTED_INITIAL_BIND_RESPONSE.
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_INITIAL_BIND_RESPONSE.
get(SASL_MECHANISM_CRAM_MD5, resultCode1,
LDAPResultCode.toString(resultCode1), errorMessage);
throw new LDAPException(resultCode1, errorMessage, message,
@@ -1001,7 +1001,7 @@
ByteString serverChallenge = bindResponse1.getServerSASLCredentials();
if (serverChallenge == null)
{
- Message message = ERR_LDAPAUTH_NO_CRAMMD5_SERVER_CREDENTIALS.get();
+ LocalizableMessage message = ERR_LDAPAUTH_NO_CRAMMD5_SERVER_CREDENTIALS.get();
throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, message);
}
@@ -1028,14 +1028,14 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_SECOND_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SECOND_SASL_BIND.get(
SASL_MECHANISM_CRAM_MD5, getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_SECOND_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SECOND_SASL_BIND.get(
SASL_MECHANISM_CRAM_MD5, getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -1049,7 +1049,7 @@
responseMessage2 = reader.readMessage();
if (responseMessage2 == null)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CONNECTION_CLOSED_WITHOUT_BIND_RESPONSE.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_SERVER_DOWN,
message);
@@ -1057,28 +1057,28 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
SASL_MECHANISM_CRAM_MD5, getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (ASN1Exception ae)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
SASL_MECHANISM_CRAM_MD5, getExceptionMessage(ae));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, ae);
}
catch (LDAPException le)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
SASL_MECHANISM_CRAM_MD5, getExceptionMessage(le));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, le);
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
SASL_MECHANISM_CRAM_MD5, getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -1110,21 +1110,21 @@
if ((responseOID != null) &&
responseOID.equals(OID_NOTICE_OF_DISCONNECTION))
{
- Message message = ERR_LDAPAUTH_SERVER_DISCONNECT.
+ LocalizableMessage message = ERR_LDAPAUTH_SERVER_DISCONNECT.
get(extendedResponse.getResultCode(),
extendedResponse.getErrorMessage());
throw new LDAPException(extendedResponse.getResultCode(), message);
}
else
{
- Message message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
String.valueOf(extendedResponse));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message);
}
default:
- Message message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
String.valueOf(responseMessage2.getProtocolOp()));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
@@ -1143,7 +1143,7 @@
// FIXME -- Add support for referrals.
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_SASL_BIND_FAILED.get(SASL_MECHANISM_CRAM_MD5);
throw new LDAPException(resultCode2, bindResponse2.getErrorMessage(),
message, bindResponse2.getMatchedDN(), null);
@@ -1178,7 +1178,7 @@
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_INITIALIZE_MD5_DIGEST.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_INITIALIZE_MD5_DIGEST.get(
getExceptionMessage(e));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message, e);
@@ -1255,10 +1255,10 @@
* SASL CRAM-MD5 bind, mapped from the property names to their
* corresponding descriptions.
*/
- public static LinkedHashMap<String,Message> getSASLCRAMMD5Properties()
+ public static LinkedHashMap<String,LocalizableMessage> getSASLCRAMMD5Properties()
{
- LinkedHashMap<String,Message> properties =
- new LinkedHashMap<String,Message>(1);
+ LinkedHashMap<String,LocalizableMessage> properties =
+ new LinkedHashMap<String,LocalizableMessage>(1);
properties.put(SASL_PROPERTY_AUTHID,
INFO_LDAPAUTH_PROPERTY_DESCRIPTION_AUTHID.get());
@@ -1312,7 +1312,7 @@
// QoP, digest URI, and authzID are optional.
if ((saslProperties == null) || saslProperties.isEmpty())
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_NO_SASL_PROPERTIES.get(SASL_MECHANISM_DIGEST_MD5);
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
@@ -1334,7 +1334,7 @@
if (iterator.hasNext())
{
- Message message = ERR_LDAPAUTH_AUTHID_SINGLE_VALUED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_AUTHID_SINGLE_VALUED.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -1351,7 +1351,7 @@
if (iterator.hasNext())
{
- Message message = ERR_LDAPAUTH_REALM_SINGLE_VALUED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_REALM_SINGLE_VALUED.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -1367,7 +1367,7 @@
if (iterator.hasNext())
{
- Message message = ERR_LDAPAUTH_QOP_SINGLE_VALUED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_QOP_SINGLE_VALUED.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -1379,14 +1379,14 @@
else if (qop.equals("auth-int") || qop.equals("auth-conf"))
{
// FIXME -- Add support for integrity and confidentiality.
- Message message = ERR_LDAPAUTH_DIGESTMD5_QOP_NOT_SUPPORTED.get(qop);
+ LocalizableMessage message = ERR_LDAPAUTH_DIGESTMD5_QOP_NOT_SUPPORTED.get(qop);
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
else
{
// This is an illegal value.
- Message message = ERR_LDAPAUTH_DIGESTMD5_INVALID_QOP.get(qop);
+ LocalizableMessage message = ERR_LDAPAUTH_DIGESTMD5_INVALID_QOP.get(qop);
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -1402,7 +1402,7 @@
if (iterator.hasNext())
{
- Message message = ERR_LDAPAUTH_DIGEST_URI_SINGLE_VALUED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_DIGEST_URI_SINGLE_VALUED.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -1418,7 +1418,7 @@
if (iterator.hasNext())
{
- Message message = ERR_LDAPAUTH_AUTHZID_SINGLE_VALUED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_AUTHZID_SINGLE_VALUED.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -1426,7 +1426,7 @@
}
else
{
- Message message = ERR_LDAPAUTH_INVALID_SASL_PROPERTY.get(
+ LocalizableMessage message = ERR_LDAPAUTH_INVALID_SASL_PROPERTY.get(
name, SASL_MECHANISM_DIGEST_MD5);
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
@@ -1437,7 +1437,7 @@
// Make sure that the authID was provided.
if ((authID == null) || (authID.length() == 0))
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_SASL_AUTHID_REQUIRED.get(SASL_MECHANISM_DIGEST_MD5);
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
@@ -1468,14 +1468,14 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_INITIAL_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_INITIAL_SASL_BIND.get(
SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_INITIAL_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_INITIAL_SASL_BIND.get(
SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(e));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_ENCODING_ERROR,
message, e);
@@ -1489,7 +1489,7 @@
responseMessage1 = reader.readMessage();
if (responseMessage1 == null)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CONNECTION_CLOSED_WITHOUT_BIND_RESPONSE.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_SERVER_DOWN,
message);
@@ -1497,28 +1497,28 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (ASN1Exception ae)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(ae));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, ae);
}
catch (LDAPException le)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(le));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, le);
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -1541,21 +1541,21 @@
if ((responseOID != null) &&
responseOID.equals(OID_NOTICE_OF_DISCONNECTION))
{
- Message message = ERR_LDAPAUTH_SERVER_DISCONNECT.
+ LocalizableMessage message = ERR_LDAPAUTH_SERVER_DISCONNECT.
get(extendedResponse.getResultCode(),
extendedResponse.getErrorMessage());
throw new LDAPException(extendedResponse.getResultCode(), message);
}
else
{
- Message message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
String.valueOf(extendedResponse));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message);
}
default:
- Message message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
String.valueOf(responseMessage1.getProtocolOp()));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
@@ -1569,13 +1569,13 @@
int resultCode1 = bindResponse1.getResultCode();
if (resultCode1 != LDAPResultCode.SASL_BIND_IN_PROGRESS)
{
- Message errorMessage = bindResponse1.getErrorMessage();
+ LocalizableMessage errorMessage = bindResponse1.getErrorMessage();
if (errorMessage == null)
{
- errorMessage = Message.EMPTY;
+ errorMessage = LocalizableMessage.EMPTY;
}
- Message message = ERR_LDAPAUTH_UNEXPECTED_INITIAL_BIND_RESPONSE.
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_INITIAL_BIND_RESPONSE.
get(SASL_MECHANISM_DIGEST_MD5, resultCode1,
LDAPResultCode.toString(resultCode1), errorMessage);
throw new LDAPException(resultCode1, errorMessage, message,
@@ -1589,7 +1589,7 @@
bindResponse1.getServerSASLCredentials();
if (serverCredentials == null)
{
- Message message = ERR_LDAPAUTH_NO_DIGESTMD5_SERVER_CREDENTIALS.get();
+ LocalizableMessage message = ERR_LDAPAUTH_NO_DIGESTMD5_SERVER_CREDENTIALS.get();
throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, message);
}
@@ -1611,7 +1611,7 @@
{
// This is bad because we're not at the end of the string but we don't
// have a name/value delimiter.
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_DIGESTMD5_INVALID_TOKEN_IN_CREDENTIALS.get(
credString, pos);
throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, message);
@@ -1629,7 +1629,7 @@
// The value must be the string "utf-8". If not, that's an error.
if (! tokenValue.equalsIgnoreCase("utf-8"))
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_DIGESTMD5_INVALID_CHARSET.get(tokenValue);
throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, message);
}
@@ -1677,7 +1677,7 @@
if (! qopModes.contains(qop))
{
- Message message = ERR_LDAPAUTH_REQUESTED_QOP_NOT_SUPPORTED_BY_SERVER.
+ LocalizableMessage message = ERR_LDAPAUTH_REQUESTED_QOP_NOT_SUPPORTED_BY_SERVER.
get(qop, tokenValue);
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
@@ -1696,7 +1696,7 @@
// Make sure that the nonce was included in the response from the server.
if (nonce == null)
{
- Message message = ERR_LDAPAUTH_DIGESTMD5_NO_NONCE.get();
+ LocalizableMessage message = ERR_LDAPAUTH_DIGESTMD5_NO_NONCE.get();
throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, message);
}
@@ -1723,7 +1723,7 @@
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_DIGESTMD5_CANNOT_CREATE_RESPONSE_DIGEST.
+ LocalizableMessage message = ERR_LDAPAUTH_DIGESTMD5_CANNOT_CREATE_RESPONSE_DIGEST.
get(getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -1784,14 +1784,14 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_SECOND_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SECOND_SASL_BIND.get(
SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_SECOND_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SECOND_SASL_BIND.get(
SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(e));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_ENCODING_ERROR,
message, e);
@@ -1805,7 +1805,7 @@
responseMessage2 = reader.readMessage();
if (responseMessage2 == null)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CONNECTION_CLOSED_WITHOUT_BIND_RESPONSE.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_SERVER_DOWN,
message);
@@ -1813,28 +1813,28 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (ASN1Exception ae)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(ae));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, ae);
}
catch (LDAPException le)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(le));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, le);
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -1866,21 +1866,21 @@
if ((responseOID != null) &&
responseOID.equals(OID_NOTICE_OF_DISCONNECTION))
{
- Message message = ERR_LDAPAUTH_SERVER_DISCONNECT.
+ LocalizableMessage message = ERR_LDAPAUTH_SERVER_DISCONNECT.
get(extendedResponse.getResultCode(),
extendedResponse.getErrorMessage());
throw new LDAPException(extendedResponse.getResultCode(), message);
}
else
{
- Message message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
String.valueOf(extendedResponse));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message);
}
default:
- Message message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
String.valueOf(responseMessage2.getProtocolOp()));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
@@ -1894,7 +1894,7 @@
{
// FIXME -- Add support for referrals.
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_SASL_BIND_FAILED.get(SASL_MECHANISM_DIGEST_MD5);
throw new LDAPException(resultCode2, bindResponse2.getErrorMessage(),
message, bindResponse2.getMatchedDN(),
@@ -1907,14 +1907,14 @@
ByteString rspAuthCreds = bindResponse2.getServerSASLCredentials();
if (rspAuthCreds == null)
{
- Message message = ERR_LDAPAUTH_DIGESTMD5_NO_RSPAUTH_CREDS.get();
+ LocalizableMessage message = ERR_LDAPAUTH_DIGESTMD5_NO_RSPAUTH_CREDS.get();
throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, message);
}
String credStr = toLowerCase(rspAuthCreds.toString());
if (! credStr.startsWith("rspauth="))
{
- Message message = ERR_LDAPAUTH_DIGESTMD5_NO_RSPAUTH_CREDS.get();
+ LocalizableMessage message = ERR_LDAPAUTH_DIGESTMD5_NO_RSPAUTH_CREDS.get();
throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, message);
}
@@ -1926,7 +1926,7 @@
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_DIGESTMD5_COULD_NOT_DECODE_RSPAUTH.get(
+ LocalizableMessage message = ERR_LDAPAUTH_DIGESTMD5_COULD_NOT_DECODE_RSPAUTH.get(
getExceptionMessage(e));
throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, message);
}
@@ -1941,7 +1941,7 @@
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_DIGESTMD5_COULD_NOT_CALCULATE_RSPAUTH.get(
+ LocalizableMessage message = ERR_LDAPAUTH_DIGESTMD5_COULD_NOT_CALCULATE_RSPAUTH.get(
getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
@@ -1949,7 +1949,7 @@
if (! Arrays.equals(serverRspAuth, clientRspAuth))
{
- Message message = ERR_LDAPAUTH_DIGESTMD5_RSPAUTH_MISMATCH.get();
+ LocalizableMessage message = ERR_LDAPAUTH_DIGESTMD5_RSPAUTH_MISMATCH.get();
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
}
@@ -2075,7 +2075,7 @@
{
// We found the closing quote before the end of the token. This
// is not fine.
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_DIGESTMD5_INVALID_CLOSING_QUOTE_POS.get((pos-2));
throw new LDAPException(LDAPResultCode.INVALID_CREDENTIALS,
message);
@@ -2173,7 +2173,7 @@
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_INITIALIZE_MD5_DIGEST.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_INITIALIZE_MD5_DIGEST.get(
getExceptionMessage(e));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message, e);
@@ -2376,10 +2376,10 @@
* SASL DIGEST-MD5 bind, mapped from the property names to their
* corresponding descriptions.
*/
- public static LinkedHashMap<String,Message> getSASLDigestMD5Properties()
+ public static LinkedHashMap<String,LocalizableMessage> getSASLDigestMD5Properties()
{
- LinkedHashMap<String,Message> properties =
- new LinkedHashMap<String,Message>(5);
+ LinkedHashMap<String,LocalizableMessage> properties =
+ new LinkedHashMap<String,LocalizableMessage>(5);
properties.put(SASL_PROPERTY_AUTHID,
INFO_LDAPAUTH_PROPERTY_DESCRIPTION_AUTHID.get());
@@ -2431,7 +2431,7 @@
// Make sure that no SASL properties were provided.
if ((saslProperties != null) && (! saslProperties.isEmpty()))
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_NO_ALLOWED_SASL_PROPERTIES.get(SASL_MECHANISM_EXTERNAL);
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_PARAM_ERROR, message);
@@ -2452,14 +2452,14 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
SASL_MECHANISM_EXTERNAL, getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
SASL_MECHANISM_EXTERNAL, getExceptionMessage(e));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_ENCODING_ERROR,
message, e);
@@ -2473,7 +2473,7 @@
responseMessage = reader.readMessage();
if (responseMessage == null)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CONNECTION_CLOSED_WITHOUT_BIND_RESPONSE.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_SERVER_DOWN,
message);
@@ -2481,28 +2481,28 @@
}
catch (IOException ioe)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (ASN1Exception ae)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, ae);
}
catch (LDAPException le)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(le));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, le);
}
catch (Exception e)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -2534,21 +2534,21 @@
if ((responseOID != null) &&
responseOID.equals(OID_NOTICE_OF_DISCONNECTION))
{
- Message message = ERR_LDAPAUTH_SERVER_DISCONNECT.
+ LocalizableMessage message = ERR_LDAPAUTH_SERVER_DISCONNECT.
get(extendedResponse.getResultCode(),
extendedResponse.getErrorMessage());
throw new LDAPException(extendedResponse.getResultCode(), message);
}
else
{
- Message message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
String.valueOf(extendedResponse));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message);
}
default:
- Message message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
String.valueOf(responseMessage.getProtocolOp()));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
@@ -2567,7 +2567,7 @@
// FIXME -- Add support for referrals.
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_SASL_BIND_FAILED.get(SASL_MECHANISM_EXTERNAL);
throw new LDAPException(resultCode, bindResponse.getErrorMessage(),
message, bindResponse.getMatchedDN(), null);
@@ -2584,10 +2584,10 @@
* SASL EXTERNAL bind, mapped from the property names to their
* corresponding descriptions.
*/
- public static LinkedHashMap<String,Message> getSASLExternalProperties()
+ public static LinkedHashMap<String,LocalizableMessage> getSASLExternalProperties()
{
// There are no properties for the SASL EXTERNAL mechanism.
- return new LinkedHashMap<String,Message>(0);
+ return new LinkedHashMap<String,LocalizableMessage>(0);
}
@@ -2648,7 +2648,7 @@
// KDC, QoP, and realm are optional.
if ((saslProperties == null) || saslProperties.isEmpty())
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_NO_SASL_PROPERTIES.get(SASL_MECHANISM_GSSAPI);
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_PARAM_ERROR, message);
@@ -2670,7 +2670,7 @@
if (iterator.hasNext())
{
- Message message = ERR_LDAPAUTH_AUTHID_SINGLE_VALUED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_AUTHID_SINGLE_VALUED.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -2686,7 +2686,7 @@
if (iterator.hasNext())
{
- Message message = ERR_LDAPAUTH_AUTHZID_SINGLE_VALUED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_AUTHZID_SINGLE_VALUED.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -2702,7 +2702,7 @@
if (iterator.hasNext())
{
- Message message = ERR_LDAPAUTH_KDC_SINGLE_VALUED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_KDC_SINGLE_VALUED.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -2718,7 +2718,7 @@
if (iterator.hasNext())
{
- Message message = ERR_LDAPAUTH_QOP_SINGLE_VALUED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_QOP_SINGLE_VALUED.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -2731,7 +2731,7 @@
gssapiQoP.equals("auth-conf"))
{
// FIXME -- Add support for integrity and confidentiality.
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_DIGESTMD5_QOP_NOT_SUPPORTED.get(gssapiQoP);
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
@@ -2739,7 +2739,7 @@
else
{
// This is an illegal value.
- Message message = ERR_LDAPAUTH_GSSAPI_INVALID_QOP.get(gssapiQoP);
+ LocalizableMessage message = ERR_LDAPAUTH_GSSAPI_INVALID_QOP.get(gssapiQoP);
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -2755,7 +2755,7 @@
if (iterator.hasNext())
{
- Message message = ERR_LDAPAUTH_REALM_SINGLE_VALUED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_REALM_SINGLE_VALUED.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -2763,7 +2763,7 @@
}
else
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_INVALID_SASL_PROPERTY.get(name, SASL_MECHANISM_GSSAPI);
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_PARAM_ERROR, message);
@@ -2774,7 +2774,7 @@
// Make sure that the authID was provided.
if ((gssapiAuthID == null) || (gssapiAuthID.length() == 0))
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_SASL_AUTHID_REQUIRED.get(SASL_MECHANISM_GSSAPI);
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_PARAM_ERROR, message);
@@ -2829,7 +2829,7 @@
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_GSSAPI_CANNOT_CREATE_JAAS_CONFIG.get(
+ LocalizableMessage message = ERR_LDAPAUTH_GSSAPI_CANNOT_CREATE_JAAS_CONFIG.get(
getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -2849,7 +2849,7 @@
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_GSSAPI_LOCAL_AUTHENTICATION_FAILED.get(
+ LocalizableMessage message = ERR_LDAPAUTH_GSSAPI_LOCAL_AUTHENTICATION_FAILED.get(
getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -2870,7 +2870,7 @@
throw (LDAPException) e;
}
- Message message = ERR_LDAPAUTH_GSSAPI_REMOTE_AUTHENTICATION_FAILED.get(
+ LocalizableMessage message = ERR_LDAPAUTH_GSSAPI_REMOTE_AUTHENTICATION_FAILED.get(
getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -2894,10 +2894,10 @@
* SASL EXTERNAL bind, mapped from the property names to their
* corresponding descriptions.
*/
- public static LinkedHashMap<String,Message> getSASLGSSAPIProperties()
+ public static LinkedHashMap<String,LocalizableMessage> getSASLGSSAPIProperties()
{
- LinkedHashMap<String,Message> properties =
- new LinkedHashMap<String,Message>(4);
+ LinkedHashMap<String,LocalizableMessage> properties =
+ new LinkedHashMap<String,LocalizableMessage>(4);
properties.put(SASL_PROPERTY_AUTHID,
INFO_LDAPAUTH_PROPERTY_DESCRIPTION_AUTHID.get());
@@ -2953,7 +2953,7 @@
// optional.
if ((saslProperties == null) || saslProperties.isEmpty())
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_NO_SASL_PROPERTIES.get(SASL_MECHANISM_PLAIN);
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_PARAM_ERROR, message);
@@ -2975,7 +2975,7 @@
if (iterator.hasNext())
{
- Message message = ERR_LDAPAUTH_AUTHID_SINGLE_VALUED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_AUTHID_SINGLE_VALUED.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -2991,7 +2991,7 @@
if (iterator.hasNext())
{
- Message message = ERR_LDAPAUTH_AUTHZID_SINGLE_VALUED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_AUTHZID_SINGLE_VALUED.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_PARAM_ERROR,
message);
}
@@ -2999,7 +2999,7 @@
}
else
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_INVALID_SASL_PROPERTY.get(name, SASL_MECHANISM_PLAIN);
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_PARAM_ERROR, message);
@@ -3010,7 +3010,7 @@
// Make sure that at least the authID was provided.
if ((authID == null) || (authID.length() == 0))
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_SASL_AUTHID_REQUIRED.get(SASL_MECHANISM_PLAIN);
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_PARAM_ERROR, message);
@@ -3050,14 +3050,14 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
SASL_MECHANISM_PLAIN, getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
SASL_MECHANISM_PLAIN, getExceptionMessage(e));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_ENCODING_ERROR,
message, e);
@@ -3071,7 +3071,7 @@
responseMessage = reader.readMessage();
if (responseMessage == null)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CONNECTION_CLOSED_WITHOUT_BIND_RESPONSE.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_SERVER_DOWN,
message);
@@ -3079,28 +3079,28 @@
}
catch (IOException ioe)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (ASN1Exception ae)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, ae);
}
catch (LDAPException le)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(le));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, le);
}
catch (Exception e)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -3132,21 +3132,21 @@
if ((responseOID != null) &&
responseOID.equals(OID_NOTICE_OF_DISCONNECTION))
{
- Message message = ERR_LDAPAUTH_SERVER_DISCONNECT.
+ LocalizableMessage message = ERR_LDAPAUTH_SERVER_DISCONNECT.
get(extendedResponse.getResultCode(),
extendedResponse.getErrorMessage());
throw new LDAPException(extendedResponse.getResultCode(), message);
}
else
{
- Message message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
String.valueOf(extendedResponse));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message);
}
default:
- Message message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
String.valueOf(responseMessage.getProtocolOp()));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
@@ -3165,7 +3165,7 @@
// FIXME -- Add support for referrals.
- Message message = ERR_LDAPAUTH_SASL_BIND_FAILED.get(SASL_MECHANISM_PLAIN);
+ LocalizableMessage message = ERR_LDAPAUTH_SASL_BIND_FAILED.get(SASL_MECHANISM_PLAIN);
throw new LDAPException(resultCode, bindResponse.getErrorMessage(),
message, bindResponse.getMatchedDN(), null);
}
@@ -3181,10 +3181,10 @@
* SASL PLAIN bind, mapped from the property names to their
* corresponding descriptions.
*/
- public static LinkedHashMap<String,Message> getSASLPlainProperties()
+ public static LinkedHashMap<String,LocalizableMessage> getSASLPlainProperties()
{
- LinkedHashMap<String,Message> properties =
- new LinkedHashMap<String,Message>(2);
+ LinkedHashMap<String,LocalizableMessage> properties =
+ new LinkedHashMap<String,LocalizableMessage>(2);
properties.put(SASL_PROPERTY_AUTHID,
INFO_LDAPAUTH_PROPERTY_DESCRIPTION_AUTHID.get());
@@ -3215,7 +3215,7 @@
{
if (saslMechanism == null)
{
- Message message = ERR_LDAPAUTH_NONSASL_RUN_INVOCATION.get(getBacktrace());
+ LocalizableMessage message = ERR_LDAPAUTH_NONSASL_RUN_INVOCATION.get(getBacktrace());
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
}
@@ -3239,7 +3239,7 @@
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_GSSAPI_CANNOT_CREATE_SASL_CLIENT.get(
+ LocalizableMessage message = ERR_LDAPAUTH_GSSAPI_CANNOT_CREATE_SASL_CLIENT.get(
getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -3257,7 +3257,7 @@
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_GSSAPI_CANNOT_CREATE_INITIAL_CHALLENGE.
+ LocalizableMessage message = ERR_LDAPAUTH_GSSAPI_CANNOT_CREATE_INITIAL_CHALLENGE.
get(getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
@@ -3283,14 +3283,14 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
SASL_MECHANISM_GSSAPI, getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
SASL_MECHANISM_GSSAPI, getExceptionMessage(e));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_ENCODING_ERROR,
message, e);
@@ -3304,7 +3304,7 @@
responseMessage = reader.readMessage();
if (responseMessage == null)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CONNECTION_CLOSED_WITHOUT_BIND_RESPONSE.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_SERVER_DOWN,
message);
@@ -3312,28 +3312,28 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (ASN1Exception ae)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, ae);
}
catch (LDAPException le)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(le));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, le);
}
catch (Exception e)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -3359,21 +3359,21 @@
if ((responseOID != null) &&
responseOID.equals(OID_NOTICE_OF_DISCONNECTION))
{
- Message message = ERR_LDAPAUTH_SERVER_DISCONNECT.
+ LocalizableMessage message = ERR_LDAPAUTH_SERVER_DISCONNECT.
get(extendedResponse.getResultCode(),
extendedResponse.getErrorMessage());
throw new LDAPException(extendedResponse.getResultCode(), message);
}
else
{
- Message message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
String.valueOf(extendedResponse));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message);
}
default:
- Message message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
String.valueOf(responseMessage.getProtocolOp()));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message);
@@ -3399,7 +3399,7 @@
}
catch (Exception e)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_GSSAPI_CANNOT_VALIDATE_SERVER_CREDS.
get(getExceptionMessage(e));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
@@ -3411,7 +3411,7 @@
// Just to be sure, check that the login really is complete.
if (! saslClient.isComplete())
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_GSSAPI_UNEXPECTED_SUCCESS_RESPONSE.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message);
@@ -3439,7 +3439,7 @@
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_GSSAPI_CANNOT_VALIDATE_SERVER_CREDS.
+ LocalizableMessage message = ERR_LDAPAUTH_GSSAPI_CANNOT_VALIDATE_SERVER_CREDS.
get(getExceptionMessage(e));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message, e);
@@ -3461,14 +3461,14 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
SASL_MECHANISM_GSSAPI, getExceptionMessage(ioe));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_SERVER_DOWN,
message, ioe);
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
SASL_MECHANISM_GSSAPI, getExceptionMessage(e));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_ENCODING_ERROR,
message, e);
@@ -3481,7 +3481,7 @@
responseMessage = reader.readMessage();
if (responseMessage == null)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CONNECTION_CLOSED_WITHOUT_BIND_RESPONSE.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_SERVER_DOWN,
message);
@@ -3489,28 +3489,28 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
getExceptionMessage(ioe));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_SERVER_DOWN,
message, ioe);
}
catch (ASN1Exception ae)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
getExceptionMessage(ae));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, ae);
}
catch (LDAPException le)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
getExceptionMessage(le));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, le);
}
catch (Exception e)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
getExceptionMessage(e));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message, e);
@@ -3537,7 +3537,7 @@
if ((responseOID != null) &&
responseOID.equals(OID_NOTICE_OF_DISCONNECTION))
{
- Message message = ERR_LDAPAUTH_SERVER_DISCONNECT.
+ LocalizableMessage message = ERR_LDAPAUTH_SERVER_DISCONNECT.
get(extendedResponse.getResultCode(),
extendedResponse.getErrorMessage());
throw new LDAPException(extendedResponse.getResultCode(),
@@ -3545,14 +3545,14 @@
}
else
{
- Message message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
String.valueOf(extendedResponse));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
}
default:
- Message message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
String.valueOf(responseMessage.getProtocolOp()));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
message);
@@ -3561,7 +3561,7 @@
else
{
// This is an error.
- Message message = ERR_LDAPAUTH_GSSAPI_BIND_FAILED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_GSSAPI_BIND_FAILED.get();
throw new LDAPException(resultCode, bindResponse.getErrorMessage(),
message, bindResponse.getMatchedDN(),
null);
@@ -3570,7 +3570,7 @@
}
else
{
- Message message = ERR_LDAPAUTH_UNEXPECTED_RUN_INVOCATION.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RUN_INVOCATION.get(
saslMechanism, getBacktrace());
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
@@ -3600,7 +3600,7 @@
{
if (saslMechanism == null)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_NONSASL_CALLBACK_INVOCATION.get(getBacktrace());
throw new UnsupportedCallbackException(callbacks[0], message.toString());
}
@@ -3624,7 +3624,7 @@
}
else
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_UNEXPECTED_GSSAPI_CALLBACK.get(String.valueOf(cb));
throw new UnsupportedCallbackException(cb, message.toString());
}
@@ -3632,7 +3632,7 @@
}
else
{
- Message message = ERR_LDAPAUTH_UNEXPECTED_CALLBACK_INVOCATION.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_CALLBACK_INVOCATION.get(
saslMechanism, getBacktrace());
throw new UnsupportedCallbackException(callbacks[0], message.toString());
}
@@ -3669,14 +3669,14 @@
}
catch (IOException ioe)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_SEND_WHOAMI_REQUEST.get(getExceptionMessage(ioe));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_SERVER_DOWN,
message, ioe);
}
catch (Exception e)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_SEND_WHOAMI_REQUEST.get(getExceptionMessage(e));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_ENCODING_ERROR,
message, e);
@@ -3690,7 +3690,7 @@
responseMessage = reader.readMessage();
if (responseMessage == null)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CONNECTION_CLOSED_WITHOUT_BIND_RESPONSE.get();
throw new ClientException(LDAPResultCode.CLIENT_SIDE_SERVER_DOWN,
message);
@@ -3698,28 +3698,28 @@
}
catch (IOException ioe)
{
- Message message = ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE.get(
getExceptionMessage(ioe));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
catch (ASN1Exception ae)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE.get(getExceptionMessage(ae));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, ae);
}
catch (LDAPException le)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE.get(getExceptionMessage(le));
throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
message, le);
}
catch (Exception e)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE.get(getExceptionMessage(e));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message, e);
@@ -3729,7 +3729,7 @@
// If the protocol op isn't an extended response, then that's a problem.
if (responseMessage.getProtocolOpType() != OP_TYPE_EXTENDED_RESPONSE)
{
- Message message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
+ LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
String.valueOf(responseMessage.getProtocolOp()));
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
@@ -3744,7 +3744,7 @@
if ((responseOID != null) &&
responseOID.equals(OID_NOTICE_OF_DISCONNECTION))
{
- Message message = ERR_LDAPAUTH_SERVER_DISCONNECT.get(
+ LocalizableMessage message = ERR_LDAPAUTH_SERVER_DISCONNECT.get(
extendedResponse.getResultCode(), extendedResponse.getErrorMessage());
throw new LDAPException(extendedResponse.getResultCode(), message);
}
@@ -3756,7 +3756,7 @@
int resultCode = extendedResponse.getResultCode();
if (resultCode != LDAPResultCode.SUCCESS)
{
- Message message = ERR_LDAPAUTH_WHOAMI_FAILED.get();
+ LocalizableMessage message = ERR_LDAPAUTH_WHOAMI_FAILED.get();
throw new LDAPException(resultCode, extendedResponse.getErrorMessage(),
message, extendedResponse.getMatchedDN(),
null);
--
Gitblit v1.10.0