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/LDAPCompare.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java
index d012a82..7848411 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java
@@ -38,7 +38,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.opends.admin.ads.util.ConnectionUtils;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.controls.LDAPAssertionRequestControl;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.asn1.ASN1Exception;
@@ -266,7 +266,7 @@
}
else
{
- Message msg = INFO_OPERATION_FAILED.get("COMPARE");
+ LocalizableMessage msg = INFO_OPERATION_FAILED.get("COMPARE");
err.println(wrapText(msg, MAX_LINE_WIDTH));
err.println(wrapText(ae.getMessage(), MAX_LINE_WIDTH));
return OPERATIONS_ERROR;
@@ -276,12 +276,12 @@
CompareResponseProtocolOp op =
responseMessage.getCompareResponseProtocolOp();
int resultCode = op.getResultCode();
- Message errorMessage = op.getErrorMessage();
+ LocalizableMessage errorMessage = op.getErrorMessage();
if(resultCode != COMPARE_TRUE && resultCode != COMPARE_FALSE
&& !compareOptions.continueOnError())
{
- Message msg = INFO_OPERATION_FAILED.get("COMPARE");
+ LocalizableMessage msg = INFO_OPERATION_FAILED.get("COMPARE");
throw new LDAPException(resultCode, errorMessage, msg,
op.getMatchedDN(), null);
} else
@@ -308,7 +308,7 @@
}
} else
{
- Message msg = INFO_OPERATION_FAILED.get("COMPARE");
+ LocalizableMessage msg = INFO_OPERATION_FAILED.get("COMPARE");
LDAPToolUtils.printErrorMessage(err, msg, resultCode, errorMessage,
op.getMatchedDN());
}
@@ -413,7 +413,7 @@
Reader rdr = null;
// Create the command-line argument parser for use with this program.
- Message toolDescription = INFO_LDAPCOMPARE_TOOL_DESCRIPTION.get();
+ LocalizableMessage toolDescription = INFO_LDAPCOMPARE_TOOL_DESCRIPTION.get();
ArgumentParser argParser = new ArgumentParser(CLASS_NAME, toolDescription,
false, true, 1, 0,
" \'attribute:value\' \"DN\" ...");
@@ -666,7 +666,7 @@
argParser.setUsageArgument(showUsage, out);
} catch (ArgumentException ae)
{
- Message message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
+ LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
return CLIENT_SIDE_PARAM_ERROR;
@@ -679,7 +679,7 @@
}
catch (ArgumentException ae)
{
- Message message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
+ LocalizableMessage message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
err.println(argParser.getUsage());
@@ -695,7 +695,7 @@
if(bindPassword.isPresent() && bindPasswordFile.isPresent())
{
- Message message = ERR_TOOL_CONFLICTING_ARGS.get(
+ LocalizableMessage message = ERR_TOOL_CONFLICTING_ARGS.get(
bindPassword.getLongIdentifier(),
bindPasswordFile.getLongIdentifier());
err.println(wrapText(message, MAX_LINE_WIDTH));
@@ -706,7 +706,7 @@
if(attrAndDNStrings.isEmpty())
{
- Message message = ERR_LDAPCOMPARE_NO_ATTR.get();
+ LocalizableMessage message = ERR_LDAPCOMPARE_NO_ATTR.get();
err.println(wrapText(message, MAX_LINE_WIDTH));
return CLIENT_SIDE_PARAM_ERROR;
}
@@ -741,7 +741,7 @@
int idx = attributeString.indexOf(":");
if(idx == -1)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPCOMPARE_INVALID_ATTR_STRING.get(attributeString);
err.println(wrapText(message, MAX_LINE_WIDTH));
return CLIENT_SIDE_PARAM_ERROR;
@@ -907,7 +907,7 @@
Control ctrl = LDAPToolUtils.getControl(ctrlString, err);
if(ctrl == null)
{
- Message message = ERR_TOOL_INVALID_CONTROL_STRING.get(ctrlString);
+ LocalizableMessage message = ERR_TOOL_INVALID_CONTROL_STRING.get(ctrlString);
err.println(wrapText(message, MAX_LINE_WIDTH));
err.println(argParser.getUsage());
return CLIENT_SIDE_PARAM_ERROR;
@@ -930,7 +930,7 @@
}
catch (LDAPException le)
{
- Message message = ERR_LDAP_ASSERTION_INVALID_FILTER.get(
+ LocalizableMessage message = ERR_LDAP_ASSERTION_INVALID_FILTER.get(
le.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
return CLIENT_SIDE_PARAM_ERROR;
@@ -969,13 +969,13 @@
{
if(!connectionOptions.useSSL() && !connectionOptions.useStartTLS())
{
- Message message = ERR_TOOL_SASLEXTERNAL_NEEDS_SSL_OR_TLS.get();
+ LocalizableMessage message = ERR_TOOL_SASLEXTERNAL_NEEDS_SSL_OR_TLS.get();
err.println(wrapText(message, MAX_LINE_WIDTH));
return CLIENT_SIDE_PARAM_ERROR;
}
if(keyStorePathValue == null)
{
- Message message = ERR_TOOL_SASLEXTERNAL_NEEDS_KEYSTORE.get();
+ LocalizableMessage message = ERR_TOOL_SASLEXTERNAL_NEEDS_KEYSTORE.get();
err.println(wrapText(message, MAX_LINE_WIDTH));
return CLIENT_SIDE_PARAM_ERROR;
}
--
Gitblit v1.10.0