From cad7abf78a831586b43f185d4abd5f30265a3058 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:35 +0000
Subject: [PATCH] Remove the "configClass" tools argument
---
opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
index e3fd2b4..e83dac7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
@@ -16,7 +16,6 @@
*/
package org.opends.server.tools;
-import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.CliMessages.INFO_FILE_PLACEHOLDER;
import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.cli.CommonArguments.*;
@@ -46,7 +45,6 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigConstants;
import org.opends.server.types.Entry;
-import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
@@ -137,7 +135,6 @@
FileBasedArgument clearPasswordFile = null;
StringArgument encodedPassword = null;
FileBasedArgument encodedPasswordFile = null;
- StringArgument configClass = null;
StringArgument configFile = null;
StringArgument schemeName = null;
@@ -187,15 +184,6 @@
.description(INFO_ENCPW_DESCRIPTION_ENCODED_PW_FILE.get())
.valuePlaceholder(INFO_FILE_PLACEHOLDER.get())
.buildAndAddToParser(argParser);
- configClass =
- StringArgument.builder(OPTION_LONG_CONFIG_CLASS)
- .shortIdentifier(OPTION_SHORT_CONFIG_CLASS)
- .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
- .hidden()
- .required()
- .defaultValue(ConfigurationHandler.class.getName())
- .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
- .buildAndAddToParser(argParser);
configFile =
StringArgument.builder("configFile")
.shortIdentifier('F')
@@ -328,8 +316,7 @@
try
{
- directoryServer.initializeConfiguration(configClass.getValue(),
- configFile.getValue());
+ directoryServer.initializeConfiguration(configFile.getValue());
}
catch (InitializationException ie)
{
--
Gitblit v1.10.0