From 80c58327faaa4873369f6bb949e62792c2f708e0 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.
---
opends/src/server/org/opends/server/tools/LDAPCompare.java | 186 ++++++++++++++++++++++++----------------------
1 files changed, 96 insertions(+), 90 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/LDAPCompare.java b/opends/src/server/org/opends/server/tools/LDAPCompare.java
index 9e3ccf6..bdd2438 100644
--- a/opends/src/server/org/opends/server/tools/LDAPCompare.java
+++ b/opends/src/server/org/opends/server/tools/LDAPCompare.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.tools;
+import org.opends.messages.Message;
import java.io.BufferedReader;
import java.io.FileReader;
@@ -61,8 +62,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
-import static org.opends.server.messages.MessageHandler.*;
-import static org.opends.server.messages.ToolMessages.*;
+import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -198,8 +198,10 @@
ProtocolOp protocolOp = new CompareRequestProtocolOp(dnOctetStr,
attributeType, attrValOctetStr);
- int msgID = MSGID_PROCESSING_COMPARE_OPERATION;
- out.println(getMessage(msgID, attributeType, attrValOctetStr, dnOctetStr));
+
+ out.println(INFO_PROCESSING_COMPARE_OPERATION.get(
+ attributeType, String.valueOf(attrValOctetStr),
+ String.valueOf(dnOctetStr)));
if(!compareOptions.showOperations())
{
@@ -222,8 +224,8 @@
}
else
{
- msgID = MSGID_OPERATION_FAILED;
- String msg = getMessage(msgID, "COMPARE");
+
+ Message msg = INFO_OPERATION_FAILED.get("COMPARE");
err.println(wrapText(msg, MAX_LINE_WIDTH));
err.println(wrapText(ae.getMessage(), MAX_LINE_WIDTH));
return;
@@ -233,29 +235,28 @@
CompareResponseProtocolOp op =
responseMessage.getCompareResponseProtocolOp();
int resultCode = op.getResultCode();
- String errorMessage = op.getErrorMessage();
+ Message errorMessage = op.getErrorMessage();
if(resultCode != COMPARE_TRUE && resultCode != COMPARE_FALSE
&& !compareOptions.continueOnError())
{
- msgID = MSGID_OPERATION_FAILED;
- String msg = getMessage(msgID, "COMPARE");
- throw new LDAPException(resultCode, errorMessage, msgID, msg,
+ Message msg = INFO_OPERATION_FAILED.get("COMPARE");
+ throw new LDAPException(resultCode, errorMessage, msg,
op.getMatchedDN(), null);
} else
{
if(resultCode == COMPARE_FALSE)
{
- msgID = MSGID_COMPARE_OPERATION_RESULT_FALSE;
- out.println(getMessage(msgID, line));
+
+ out.println(INFO_COMPARE_OPERATION_RESULT_FALSE.get(line));
} else if(resultCode == COMPARE_TRUE)
{
- msgID = MSGID_COMPARE_OPERATION_RESULT_TRUE;
- out.println(getMessage(msgID, line));
+
+ out.println(INFO_COMPARE_OPERATION_RESULT_TRUE.get(line));
} else
{
- msgID = MSGID_OPERATION_FAILED;
- String msg = getMessage(msgID, "COMPARE");
+
+ Message msg = INFO_OPERATION_FAILED.get("COMPARE");
LDAPToolUtils.printErrorMessage(err, msg, resultCode, errorMessage,
op.getMatchedDN());
}
@@ -371,7 +372,7 @@
Reader rdr = null;
// Create the command-line argument parser for use with this program.
- String toolDescription = getMessage(MSGID_LDAPCOMPARE_TOOL_DESCRIPTION);
+ Message toolDescription = INFO_LDAPCOMPARE_TOOL_DESCRIPTION.get();
ArgumentParser argParser = new ArgumentParser(CLASS_NAME, toolDescription,
false, true, 1, 0,
" \'attribute:value\' \"DN\" ...");
@@ -381,29 +382,29 @@
hostName = new StringArgument("host", OPTION_SHORT_HOST,
OPTION_LONG_HOST, false, false, true,
OPTION_VALUE_HOST, "localhost", null,
- MSGID_DESCRIPTION_HOST);
+ INFO_DESCRIPTION_HOST.get());
argParser.addArgument(hostName);
port = new IntegerArgument("port", OPTION_SHORT_PORT,
OPTION_LONG_PORT, false, false, true,
OPTION_VALUE_PORT, 389, null,
- MSGID_DESCRIPTION_PORT);
+ INFO_DESCRIPTION_PORT.get());
argParser.addArgument(port);
useSSL = new BooleanArgument("useSSL", OPTION_SHORT_USE_SSL,
OPTION_LONG_USE_SSL,
- MSGID_DESCRIPTION_USE_SSL);
+ INFO_DESCRIPTION_USE_SSL.get());
argParser.addArgument(useSSL);
startTLS = new BooleanArgument("startTLS", OPTION_SHORT_START_TLS,
OPTION_LONG_START_TLS,
- MSGID_DESCRIPTION_START_TLS);
+ INFO_DESCRIPTION_START_TLS.get());
argParser.addArgument(startTLS);
bindDN = new StringArgument("bindDN", OPTION_SHORT_BINDDN,
OPTION_LONG_BINDDN, false, false, true,
OPTION_VALUE_BINDDN, null, null,
- MSGID_DESCRIPTION_BINDDN);
+ INFO_DESCRIPTION_BINDDN.get());
argParser.addArgument(bindDN);
bindPassword = new StringArgument("bindPassword", OPTION_SHORT_BINDPWD,
@@ -411,7 +412,7 @@
false, false, true,
OPTION_VALUE_BINDPWD,
null, null,
- MSGID_DESCRIPTION_BINDPASSWORD);
+ INFO_DESCRIPTION_BINDPASSWORD.get());
argParser.addArgument(bindPassword);
bindPasswordFile =
@@ -420,29 +421,30 @@
OPTION_LONG_BINDPWD_FILE,
false, false,
OPTION_VALUE_BINDPWD_FILE, null,
- null, MSGID_DESCRIPTION_BINDPASSWORDFILE);
+ null, INFO_DESCRIPTION_BINDPASSWORDFILE.get());
argParser.addArgument(bindPasswordFile);
filename = new StringArgument("filename", OPTION_SHORT_FILENAME,
OPTION_LONG_FILENAME, false, false,
true, OPTION_VALUE_FILENAME, null, null,
- MSGID_COMPARE_DESCRIPTION_FILENAME);
+ INFO_COMPARE_DESCRIPTION_FILENAME.get());
argParser.addArgument(filename);
- saslExternal = new BooleanArgument("useSASLExternal", 'r',
- "useSASLExternal",
- MSGID_DESCRIPTION_USE_SASL_EXTERNAL);
+ saslExternal =
+ new BooleanArgument("useSASLExternal", 'r',
+ "useSASLExternal",
+ INFO_DESCRIPTION_USE_SASL_EXTERNAL.get());
argParser.addArgument(saslExternal);
saslOptions = new StringArgument("saslOption", OPTION_SHORT_SASLOPTION,
OPTION_LONG_SASLOPTION, false,
true, true,
OPTION_VALUE_SASLOPTION, null, null,
- MSGID_DESCRIPTION_SASL_PROPERTIES);
+ INFO_DESCRIPTION_SASL_PROPERTIES.get());
argParser.addArgument(saslOptions);
trustAll = new BooleanArgument("trustAll", 'X', "trustAll",
- MSGID_DESCRIPTION_TRUSTALL);
+ INFO_DESCRIPTION_TRUSTALL.get());
argParser.addArgument(trustAll);
keyStorePath = new StringArgument("keyStorePath",
@@ -451,14 +453,14 @@
false, false, true,
OPTION_VALUE_KEYSTOREPATH,
null, null,
- MSGID_DESCRIPTION_KEYSTOREPATH);
+ INFO_DESCRIPTION_KEYSTOREPATH.get());
argParser.addArgument(keyStorePath);
keyStorePassword = new StringArgument("keyStorePassword",
OPTION_SHORT_KEYSTORE_PWD,
OPTION_LONG_KEYSTORE_PWD, false, false,
true, "{keyStorePassword}", null, null,
- MSGID_DESCRIPTION_KEYSTOREPASSWORD);
+ INFO_DESCRIPTION_KEYSTOREPASSWORD.get());
argParser.addArgument(keyStorePassword);
keyStorePasswordFile =
@@ -468,21 +470,23 @@
false, false,
OPTION_VALUE_KEYSTORE_PWD_FILE,
null, null,
- MSGID_DESCRIPTION_KEYSTOREPASSWORD_FILE);
+ INFO_DESCRIPTION_KEYSTOREPASSWORD_FILE.get());
argParser.addArgument(keyStorePasswordFile);
- certNickname = new StringArgument("certnickname", 'N', "certNickname",
- false, false, true, "{nickname}", null,
- null, MSGID_DESCRIPTION_CERT_NICKNAME);
+ certNickname =
+ new StringArgument("certnickname", 'N', "certNickname",
+ false, false, true, "{nickname}", null,
+ null, INFO_DESCRIPTION_CERT_NICKNAME.get());
argParser.addArgument(certNickname);
- trustStorePath = new StringArgument("trustStorePath",
- OPTION_SHORT_TRUSTSTOREPATH,
- OPTION_LONG_TRUSTSTOREPATH,
- false, false, true,
- OPTION_VALUE_TRUSTSTOREPATH,
- null, null,
- MSGID_DESCRIPTION_TRUSTSTOREPATH);
+ trustStorePath =
+ new StringArgument("trustStorePath",
+ OPTION_SHORT_TRUSTSTOREPATH,
+ OPTION_LONG_TRUSTSTOREPATH,
+ false, false, true,
+ OPTION_VALUE_TRUSTSTOREPATH,
+ null, null,
+ INFO_DESCRIPTION_TRUSTSTOREPATH.get());
argParser.addArgument(trustStorePath);
trustStorePassword =
@@ -490,65 +494,65 @@
OPTION_LONG_TRUSTSTORE_PWD,
false, false, true,
OPTION_VALUE_TRUSTSTORE_PWD, null,
- null, MSGID_DESCRIPTION_TRUSTSTOREPASSWORD);
+ null, INFO_DESCRIPTION_TRUSTSTOREPASSWORD.get());
argParser.addArgument(trustStorePassword);
trustStorePasswordFile =
- new FileBasedArgument("trustStorePasswordFile",
- OPTION_SHORT_TRUSTSTORE_PWD_FILE,
- OPTION_LONG_TRUSTSTORE_PWD_FILE, false, false,
- OPTION_VALUE_TRUSTSTORE_PWD_FILE, null, null,
- MSGID_DESCRIPTION_TRUSTSTOREPASSWORD_FILE);
+ new FileBasedArgument(
+ "trustStorePasswordFile",
+ OPTION_SHORT_TRUSTSTORE_PWD_FILE,
+ OPTION_LONG_TRUSTSTORE_PWD_FILE, false, false,
+ OPTION_VALUE_TRUSTSTORE_PWD_FILE, null, null,
+ INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE.get());
argParser.addArgument(trustStorePasswordFile);
assertionFilter = new StringArgument("assertionfilter", null,
OPTION_LONG_ASSERTION_FILE, false, false, true,
OPTION_VALUE_ASSERTION_FILE, null, null,
- MSGID_DESCRIPTION_ASSERTION_FILTER);
+ INFO_DESCRIPTION_ASSERTION_FILTER.get());
argParser.addArgument(assertionFilter);
controlStr =
new StringArgument("control", 'J', "control", false, true, true,
"{controloid[:criticality[:value|::b64value|:<filePath]]}",
- null, null, MSGID_DESCRIPTION_CONTROLS);
+ null, null, INFO_DESCRIPTION_CONTROLS.get());
argParser.addArgument(controlStr);
version = new IntegerArgument("version", OPTION_SHORT_PROTOCOL_VERSION,
OPTION_LONG_PROTOCOL_VERSION,
false, false, true,
OPTION_VALUE_PROTOCOL_VERSION,
- 3, null, MSGID_DESCRIPTION_VERSION);
+ 3, null, INFO_DESCRIPTION_VERSION.get());
argParser.addArgument(version);
encodingStr = new StringArgument("encoding", 'i', "encoding",
false, false,
true, "{encoding}", null, null,
- MSGID_DESCRIPTION_ENCODING);
+ INFO_DESCRIPTION_ENCODING.get());
argParser.addArgument(encodingStr);
continueOnError = new BooleanArgument("continueOnError", 'c',
"continueOnError",
- MSGID_DESCRIPTION_CONTINUE_ON_ERROR);
+ INFO_DESCRIPTION_CONTINUE_ON_ERROR.get());
argParser.addArgument(continueOnError);
noop = new BooleanArgument("no-op", OPTION_SHORT_DRYRUN,
OPTION_LONG_DRYRUN,
- MSGID_DESCRIPTION_NOOP);
+ INFO_DESCRIPTION_NOOP.get());
argParser.addArgument(noop);
verbose = new BooleanArgument("verbose", 'v', "verbose",
- MSGID_DESCRIPTION_VERBOSE);
+ INFO_DESCRIPTION_VERBOSE.get());
argParser.addArgument(verbose);
showUsage = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
OPTION_LONG_HELP,
- MSGID_DESCRIPTION_SHOWUSAGE);
+ INFO_DESCRIPTION_SHOWUSAGE.get());
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage, out);
} catch (ArgumentException ae)
{
- int msgID = MSGID_CANNOT_INITIALIZE_ARGS;
- String message = getMessage(msgID, ae.getMessage());
+ Message message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
@@ -561,8 +565,7 @@
}
catch (ArgumentException ae)
{
- int msgID = MSGID_ERROR_PARSING_ARGS;
- String message = getMessage(msgID, ae.getMessage());
+ Message message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
err.println(argParser.getUsage());
@@ -578,9 +581,9 @@
if(bindPassword.isPresent() && bindPasswordFile.isPresent())
{
- int msgID = MSGID_TOOL_CONFLICTING_ARGS;
- String message = getMessage(msgID, bindPassword.getLongIdentifier(),
- bindPasswordFile.getLongIdentifier());
+ Message message = ERR_TOOL_CONFLICTING_ARGS.get(
+ bindPassword.getLongIdentifier(),
+ bindPasswordFile.getLongIdentifier());
err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
@@ -589,8 +592,7 @@
if(attrAndDNStrings.isEmpty())
{
- int msgID = MSGID_LDAPCOMPARE_NO_ATTR;
- String message = getMessage(msgID);
+ Message message = ERR_LDAPCOMPARE_NO_ATTR.get();
err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
@@ -607,8 +609,8 @@
// If no DNs were provided, then exit with an error.
if (dnStrings.isEmpty())
{
- int msgID = MSGID_LDAPCOMPARE_NO_DNS;
- err.println(wrapText(getMessage(msgID), MAX_LINE_WIDTH));
+
+ err.println(wrapText(ERR_LDAPCOMPARE_NO_DNS.get(), MAX_LINE_WIDTH));
return 1;
}
@@ -616,8 +618,8 @@
int idx = attributeString.indexOf(":");
if(idx == -1)
{
- int msgID = MSGID_LDAPCOMPARE_INVALID_ATTR_STRING;
- String message = getMessage(msgID, attributeString);
+ Message message =
+ ERR_LDAPCOMPARE_INVALID_ATTR_STRING.get(attributeString);
err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
@@ -641,8 +643,9 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_COMPARE_CANNOT_BASE64_DECODE_ASSERTION_VALUE;
- err.println(wrapText(getMessage(msgID), MAX_LINE_WIDTH));
+ err.println(wrapText(
+ INFO_COMPARE_CANNOT_BASE64_DECODE_ASSERTION_VALUE.get(),
+ MAX_LINE_WIDTH));
return 1;
}
} else if(nextChar == '<')
@@ -654,9 +657,10 @@
}
catch (Exception e)
{
- int msgID = MSGID_COMPARE_CANNOT_READ_ASSERTION_VALUE_FROM_FILE;
- err.println(wrapText(getMessage(msgID, String.valueOf(e)),
- MAX_LINE_WIDTH));
+ err.println(wrapText(
+ INFO_COMPARE_CANNOT_READ_ASSERTION_VALUE_FROM_FILE.get(
+ String.valueOf(e)),
+ MAX_LINE_WIDTH));
return 1;
}
} else
@@ -689,8 +693,9 @@
int versionNumber = version.getIntValue();
if(versionNumber != 2 && versionNumber != 3)
{
- int msgID = MSGID_DESCRIPTION_INVALID_VERSION;
- err.println(wrapText(getMessage(msgID, versionNumber), MAX_LINE_WIDTH));
+
+ err.println(wrapText(ERR_DESCRIPTION_INVALID_VERSION.get(
+ String.valueOf(versionNumber)), MAX_LINE_WIDTH));
return 1;
}
connectionOptions.setVersionNumber(versionNumber);
@@ -713,7 +718,7 @@
// read the password from the stdin.
try
{
- out.print(getMessage(MSGID_LDAPAUTH_PASSWORD_PROMPT, bindDNValue));
+ out.print(INFO_LDAPAUTH_PASSWORD_PROMPT.get(bindDNValue));
char[] pwChars = PasswordReader.readPassword();
bindPasswordValue = new String(pwChars);
} catch(Exception ex)
@@ -766,8 +771,7 @@
LDAPControl ctrl = LDAPToolUtils.getControl(ctrlString, err);
if(ctrl == null)
{
- int msgID = MSGID_TOOL_INVALID_CONTROL_STRING;
- String message = getMessage(msgID, ctrlString);
+ Message message = ERR_TOOL_INVALID_CONTROL_STRING.get(ctrlString);
err.println(wrapText(message, MAX_LINE_WIDTH));
err.println(argParser.getUsage());
return 1;
@@ -791,8 +795,8 @@
}
catch (LDAPException le)
{
- int msgID = MSGID_LDAP_ASSERTION_INVALID_FILTER;
- String message = getMessage(msgID, le.getMessage());
+ Message message = ERR_LDAP_ASSERTION_INVALID_FILTER.get(
+ le.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
@@ -830,15 +834,13 @@
{
if(!connectionOptions.useSSL() && !connectionOptions.useStartTLS())
{
- int msgID = MSGID_TOOL_SASLEXTERNAL_NEEDS_SSL_OR_TLS;
- String message = getMessage(msgID);
+ Message message = ERR_TOOL_SASLEXTERNAL_NEEDS_SSL_OR_TLS.get();
err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
if(keyStorePathValue == null)
{
- int msgID = MSGID_TOOL_SASLEXTERNAL_NEEDS_KEYSTORE;
- String message = getMessage(msgID);
+ Message message = ERR_TOOL_SASLEXTERNAL_NEEDS_KEYSTORE.get();
err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
@@ -904,8 +906,11 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, le);
}
- LDAPToolUtils.printErrorMessage(err, le.getMessage(), le.getResultCode(),
- le.getErrorMessage(), le.getMatchedDN());
+ LDAPToolUtils.printErrorMessage(
+ err, le.getMessageObject(),
+ le.getResultCode(),
+ le.getMessageObject(),
+ le.getMatchedDN());
int code = le.getResultCode();
return code;
} catch(LDAPConnectionException lce)
@@ -914,9 +919,10 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, lce);
}
- LDAPToolUtils.printErrorMessage(err, lce.getMessage(),
+ LDAPToolUtils.printErrorMessage(err,
+ lce.getMessageObject(),
lce.getResultCode(),
- lce.getErrorMessage(),
+ lce.getMessageObject(),
lce.getMatchedDN());
int code = lce.getResultCode();
return code;
--
Gitblit v1.10.0