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/LDIFDiff.java | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java
index 1683012..d1e0298 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java
@@ -36,7 +36,6 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ModificationType;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
import org.opends.server.loggers.JDKLogging;
@@ -58,7 +57,6 @@
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.StringArgument;
-import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.cli.CommonArguments.*;
@@ -148,7 +146,6 @@
BooleanArgument useCompareResultCode;
BooleanArgument singleValueChanges;
BooleanArgument doCheckSchema;
- StringArgument configClass;
StringArgument configFile;
StringArgument outputLDIF;
StringArgument sourceLDIF;
@@ -217,16 +214,8 @@
.hidden()
.valuePlaceholder(INFO_CONFIGFILE_PLACEHOLDER.get())
.buildAndAddToParser(argParser);
- configClass =
- StringArgument.builder(OPTION_LONG_CONFIG_CLASS)
- .shortIdentifier(OPTION_SHORT_CONFIG_CLASS)
- .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
- .hidden()
- .defaultValue(ConfigurationHandler.class.getName())
- .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
- .buildAndAddToParser(argParser);
- showUsage = showUsageArgument();
+ showUsage = showUsageArgument();
argParser.addArgument(showUsage);
useCompareResultCode =
@@ -299,8 +288,7 @@
try
{
- directoryServer.initializeConfiguration(configClass.getValue(),
- configFile.getValue());
+ directoryServer.initializeConfiguration(configFile.getValue());
}
catch (Exception e)
{
--
Gitblit v1.10.0