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/admin/client/cli/DsFrameworkCliServer.java | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java
index 94dcaf0..19b96f2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.admin.client.cli;
@@ -50,8 +51,8 @@
import org.opends.admin.ads.ADSContextException;
import org.opends.admin.ads.ADSContext.ServerProperty;
import org.opends.admin.ads.ADSContextException.ErrorType;
-import org.opends.messages.Message;
-import org.opends.messages.MessageBuilder;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.tools.dsconfig.ArgumentExceptionFactory;
import org.opends.server.util.args.Argument;
import org.opends.server.util.args.ArgumentException;
@@ -67,19 +68,19 @@
public class DsFrameworkCliServer implements DsFrameworkCliSubCommandGroup
{
// Strings used in property help.
- private final static Message DESCRIPTION_OPTIONS_TITLE =
+ private final static LocalizableMessage DESCRIPTION_OPTIONS_TITLE =
INFO_DSCFG_HELP_DESCRIPTION_OPTION.get();
- private final static Message DESCRIPTION_OPTIONS_READ =
+ private final static LocalizableMessage DESCRIPTION_OPTIONS_READ =
INFO_DSCFG_HELP_DESCRIPTION_READ.get();
- private final static Message DESCRIPTION_OPTIONS_WRITE =
+ private final static LocalizableMessage DESCRIPTION_OPTIONS_WRITE =
INFO_DSCFG_HELP_DESCRIPTION_WRITE.get();
- private final static Message DESCRIPTION_OPTIONS_MANDATORY =
+ private final static LocalizableMessage DESCRIPTION_OPTIONS_MANDATORY =
INFO_DSCFG_HELP_DESCRIPTION_MANDATORY.get();
- private final static Message DESCRIPTION_OPTIONS_SINGLE =
+ private final static LocalizableMessage DESCRIPTION_OPTIONS_SINGLE =
INFO_DSCFG_HELP_DESCRIPTION_SINGLE_VALUED.get();
/**
@@ -362,7 +363,7 @@
ServerProperty prop = ServerProperty.ID;
String attName = prop.getAttributeName();
StringArgument arg = new StringArgument(attName, null,
- prop.getAttributeName(), false, false, true, Message.raw(""), null,
+ prop.getAttributeName(), false, false, true, LocalizableMessage.raw(""), null,
null, null);
serverProperties.put(prop, arg);
}
@@ -375,7 +376,7 @@
String attName = prop.getAttributeName();
readonlyServerProperties.add(prop);
StringArgument arg = new StringArgument(attName, null, attName, true,
- false, true, Message.raw(""), "localhost", null, null);
+ false, true, LocalizableMessage.raw(""), "localhost", null, null);
serverProperties.put(prop, arg);
}
@@ -386,7 +387,7 @@
ServerProperty prop = ServerProperty.LDAP_PORT;
String attName = prop.getAttributeName();
IntegerArgument arg = new IntegerArgument(attName, null, attName, true,
- true, true, Message.raw(attName), 389, null, null);
+ true, true, LocalizableMessage.raw(attName), 389, null, null);
serverProperties.put(prop, arg);
}
@@ -397,7 +398,7 @@
ServerProperty prop = ServerProperty.JMX_PORT;
String attName = prop.getAttributeName();
IntegerArgument arg = new IntegerArgument(attName, null, attName,
- false, true, Message.raw(attName), null);
+ false, true, LocalizableMessage.raw(attName), null);
arg.setMultiValued(true);
serverProperties.put(prop, arg);
}
@@ -409,7 +410,7 @@
ServerProperty prop = ServerProperty.JMXS_PORT;
String attName = prop.getAttributeName();
IntegerArgument arg = new IntegerArgument(attName, null, attName,
- false, true, Message.raw(attName), null);
+ false, true, LocalizableMessage.raw(attName), null);
arg.setMultiValued(true);
serverProperties.put(prop, arg);
}
@@ -421,7 +422,7 @@
ServerProperty prop = ServerProperty.LDAPS_PORT;
String attName = prop.getAttributeName();
IntegerArgument arg = new IntegerArgument(attName, null, attName,
- false, true, Message.raw(attName), null);
+ false, true, LocalizableMessage.raw(attName), null);
arg.setMultiValued(true);
serverProperties.put(prop, arg);
}
@@ -433,7 +434,7 @@
ServerProperty prop = ServerProperty.CERTIFICATE;
String attName = prop.getAttributeName();
StringArgument arg = new StringArgument(attName, null, attName, false,
- false, true, Message.raw(attName), null, null, null);
+ false, true, LocalizableMessage.raw(attName), null, null, null);
serverProperties.put(prop, arg);
}
@@ -444,7 +445,7 @@
ServerProperty prop = ServerProperty.INSTANCE_PATH;
String attName = prop.getAttributeName();
StringArgument arg = new StringArgument(attName, null, attName, false,
- false, true, Message.raw(attName), null, null, null);
+ false, true, LocalizableMessage.raw(attName), null, null, null);
serverProperties.put(prop, arg);
}
@@ -455,7 +456,7 @@
ServerProperty prop = ServerProperty.DESCRIPTION;
String attName = prop.getAttributeName();
StringArgument arg = new StringArgument(attName, null, attName, false,
- false, true, Message.raw(attName), null, null, null);
+ false, true, LocalizableMessage.raw(attName), null, null, null);
serverProperties.put(prop, arg);
}
@@ -466,7 +467,7 @@
ServerProperty prop = ServerProperty.HOST_OS;
String attName = prop.getAttributeName();
StringArgument arg = new StringArgument(attName, null, attName, false,
- false, true, Message.raw(attName), null, null, null);
+ false, true, LocalizableMessage.raw(attName), null, null, null);
serverProperties.put(prop, arg);
}
@@ -532,7 +533,7 @@
ServerProperty prop = ServerProperty.LOCATION;
String attName = prop.getAttributeName();
StringArgument arg = new StringArgument(attName, null, attName, false,
- false, true, Message.raw(attName), null, null, null);
+ false, true, LocalizableMessage.raw(attName), null, null, null);
serverProperties.put(prop, arg);
}
@@ -543,7 +544,7 @@
ServerProperty prop = ServerProperty.GROUPS;
String attName = prop.getAttributeName();
StringArgument arg = new StringArgument(attName, null, attName, false,
- true, true, Message.raw(attName), null, null, null);
+ true, true, LocalizableMessage.raw(attName), null, null, null);
arg.setHidden(true);
serverProperties.put(prop, arg);
}
@@ -555,7 +556,7 @@
ServerProperty prop = ServerProperty.INSTANCE_KEY_ID;
String attName = prop.getAttributeName();
StringArgument arg = new StringArgument(attName, null, prop
- .getAttributeName(), false, false, true, Message.raw(""), null, null,
+ .getAttributeName(), false, false, true, LocalizableMessage.raw(""), null, null,
null);
serverProperties.put(prop, arg);
}
@@ -567,7 +568,7 @@
ServerProperty prop = ServerProperty.INSTANCE_PUBLIC_KEY_CERTIFICATE;
String attName = prop.getAttributeName();
StringArgument arg = new StringArgument(attName, null, prop
- .getAttributeName(), false, false, true, Message.raw(""), null, null,
+ .getAttributeName(), false, false, true, LocalizableMessage.raw(""), null, null,
null);
serverProperties.put(prop, arg);
}
@@ -922,23 +923,23 @@
.getServerPropFromName(propertyName);
if (serverProperty == null)
{
- Message message = ERR_CLI_ERROR_PROPERTY_UNRECOGNIZED.get(propertyName);
+ LocalizableMessage message = ERR_CLI_ERROR_PROPERTY_UNRECOGNIZED.get(propertyName);
throw new ArgumentException(message);
}
// Check that propName is not hidden.
if (serverProperties.get(serverProperty).isHidden())
{
- Message message = ERR_CLI_ERROR_PROPERTY_UNRECOGNIZED.get(propertyName);
+ LocalizableMessage message = ERR_CLI_ERROR_PROPERTY_UNRECOGNIZED.get(propertyName);
throw new ArgumentException(message);
}
// Check the property Syntax.
- MessageBuilder invalidReason = new MessageBuilder();
+ LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder();
Argument arg = serverProperties.get(serverProperty) ;
if ( ! arg.valueIsAcceptable(value, invalidReason))
{
- Message message =
+ LocalizableMessage message =
ERR_CLI_ERROR_INVALID_PROPERTY_VALUE.get(propertyName, value);
throw new ArgumentException(message);
}
@@ -969,7 +970,7 @@
// but not yet is the map. Check if we have a default value.
if (arg.getDefaultValue() == null)
{
- Message message =
+ LocalizableMessage message =
ERR_CLI_ERROR_MISSING_PROPERTY.get(s.getAttributeName());
throw new ArgumentException(message);
}
--
Gitblit v1.10.0