From a39783c0d0b94e6eef5e7836168d919442c77f56 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 03 Feb 2015 13:55:55 +0000
Subject: [PATCH] OPENDJ-1778 Tools --help display the java class name instead of the command name
---
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
index 642f113..3a403fd 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
@@ -167,7 +167,7 @@
new ArrayList<PropertyDefinition<?>>(defn.getAllPropertyDefinitions());
Collections.sort(props);
- final String propPrefix = DSCONFIGTOOLNAME + "-" + sc.getName() + "-" + argLongID + "-";
+ final String propPrefix = getScriptName() + "-" + sc.getName() + "-" + argLongID + "-";
sb.append(EOL);
toSimpleList(props, propPrefix, sb);
sb.append(EOL);
@@ -1239,7 +1239,7 @@
* @return <T> The builded command.
*/
<T> CommandBuilder getCommandBuilder(final T subCommand) {
- final String commandName = getCommandName();
+ final String commandName = getScriptName();
final String subCommandName;
if (subCommand instanceof SubCommandHandler) {
subCommandName = ((SubCommandHandler) subCommand).getSubCommand().getName();
@@ -1272,7 +1272,7 @@
return commandBuilder;
}
- private String getCommandName() {
+ private String getScriptName() {
final String commandName = System.getProperty(PROPERTY_SCRIPT_NAME);
if (commandName != null && commandName.length() != 0) {
return commandName;
@@ -1338,7 +1338,7 @@
*/
private String getSessionStartTimeMessage() {
final String date = formatDateTimeStringForEquivalentCommand(new Date(sessionStartTime));
- return INFO_DSCFG_SESSION_START_TIME_MESSAGE.get(getCommandName(), date).toString();
+ return INFO_DSCFG_SESSION_START_TIME_MESSAGE.get(getScriptName(), date).toString();
}
private void handleBatchFile(String[] args) {
--
Gitblit v1.10.0