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/ConfigureDS.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
index 4d24de8..5d2684f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
@@ -264,7 +264,6 @@
private IntegerArgument ldapsPort;
private IntegerArgument jmxPort;
private StringArgument baseDNString;
- private StringArgument configClass;
private StringArgument configFile;
private StringArgument rootDNString;
private StringArgument rootPassword;
@@ -367,14 +366,6 @@
.required()
.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);
String defaultHostName;
try
{
@@ -585,7 +576,7 @@
try
{
- directoryServer.initializeConfiguration(configClass.getValue(), configFile.getValue());
+ directoryServer.initializeConfiguration(configFile.getValue());
}
catch (final Exception e)
{
@@ -964,10 +955,11 @@
if (certNickNames.isPresent())
{
- updateCertNicknameEntry(ldapPort, DN_LDAP_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, certNickNames.getValues());
- updateCertNicknameEntry(ldapsPort, DN_LDAPS_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, certNickNames.getValues());
- updateCertNicknameEntry(certNickNames, DN_HTTP_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, certNickNames.getValues());
- updateCertNicknameEntry(jmxPort, DN_JMX_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, certNickNames.getValues());
+ final List<String> attrValues = certNickNames.getValues();
+ updateCertNicknameEntry(ldapPort, DN_LDAP_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, attrValues);
+ updateCertNicknameEntry(ldapsPort, DN_LDAPS_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, attrValues);
+ updateCertNicknameEntry(certNickNames, DN_HTTP_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, attrValues);
+ updateCertNicknameEntry(jmxPort, DN_JMX_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, attrValues);
}
else
{
--
Gitblit v1.10.0