From d915b1318351be440667daf4f19bb03103b75361 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 02 Aug 2016 07:41:31 +0000
Subject: [PATCH] use DN in quicksetup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
index 5cbf988..487bfe5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
@@ -193,8 +193,8 @@
private String lastResetKeyStorePath;
private Boolean lastResetEnableWindowsService;
private Boolean lastResetStartServer;
- private String lastResetBaseDN = Installation.DEFAULT_INTERACTIVE_BASE_DN;
- private String lastResetDirectoryManagerDN;
+ private DN lastResetBaseDN = DN.valueOf(Installation.DEFAULT_INTERACTIVE_BASE_DN);
+ private DN lastResetDirectoryManagerDN;
private Integer lastResetLdapPort;
private Integer lastResetLdapsPort;
private Integer lastResetAdminConnectorPort;
@@ -289,7 +289,7 @@
return InstallReturnCode.ERROR_UNEXPECTED.getReturnCode();
}
- lastResetDirectoryManagerDN = argParser.directoryManagerDNArg.getDefaultValue();
+ lastResetDirectoryManagerDN = DN.valueOf(argParser.directoryManagerDNArg.getDefaultValue());
lastResetLdapPort = Integer.parseInt(argParser.ldapPortArg.getDefaultValue());
lastResetLdapsPort = Integer.parseInt(argParser.ldapsPortArg.getDefaultValue());
lastResetAdminConnectorPort = Integer.parseInt(argParser.adminConnectorPortArg.getDefaultValue());
@@ -661,7 +661,7 @@
errorMessages.add(ERR_INSTALLDS_EMPTY_DN_RESPONSE.get());
}
checkBaseDN(dmDN, errorMessages);
- uData.setDirectoryManagerDn(argParser.directoryManagerDNArg.getValue());
+ uData.setDirectoryManagerDn(DN.valueOf(argParser.directoryManagerDNArg.getValue()));
// Check the validity of the directory manager password
if (argParser.getDirectoryManagerPassword().isEmpty()) {
@@ -902,7 +902,7 @@
{
final LinkedList<String> dns = promptIfRequiredForDNs(
argParser.directoryManagerDNArg, lastResetDirectoryManagerDN, INFO_INSTALLDS_PROMPT_ROOT_DN.get(), true);
- uData.setDirectoryManagerDn(dns.getFirst());
+ uData.setDirectoryManagerDn(DN.valueOf(dns.getFirst()));
int nTries = 0;
String pwd = argParser.getDirectoryManagerPassword();
@@ -956,7 +956,7 @@
* @throws UserDataException
* if something went wrong checking the data.
*/
- private LinkedList<String> promptIfRequiredForDNs(StringArgument arg, String valueToSuggest,
+ private LinkedList<String> promptIfRequiredForDNs(StringArgument arg, DN valueToSuggest,
LocalizableMessage promptMsg, boolean includeLineBreak) throws UserDataException
{
final LinkedList<String> dns = new LinkedList<>();
@@ -979,7 +979,7 @@
}
try
{
- final String dn = readInput(promptMsg, valueToSuggest);
+ final String dn = readInput(promptMsg, valueToSuggest.toString());
firstPrompt = false;
dns.add(dn);
prompted = true;
@@ -2308,7 +2308,7 @@
LocalizableMessage.raw(jmxPort != -1 ? String.valueOf(jmxPort) : ""),
LocalizableMessage.raw(
Utils.getSecurityOptionsString(uData.getSecurityOptions(), false)),
- LocalizableMessage.raw(uData.getDirectoryManagerDn()),
+ LocalizableMessage.raw(uData.getDirectoryManagerDn().toString()),
LocalizableMessage.raw(Utils.getDataDisplayString(uData)),
};
int maxWidth = 0;
@@ -2460,7 +2460,7 @@
final LinkedList<String> baseDNs = uData.getNewSuffixOptions().getBaseDns();
if (!baseDNs.isEmpty())
{
- lastResetBaseDN = baseDNs.getFirst();
+ lastResetBaseDN = DN.valueOf(baseDNs.getFirst());
}
final NewSuffixOptions suffixOptions = uData.getNewSuffixOptions();
--
Gitblit v1.10.0