From 99f943f6575fec2ff44ac4b77947e60edad5ca5e Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 24 Mar 2015 10:51:00 +0000
Subject: [PATCH] OPENDJ-1887 OPENDJ-435 Add default baseDN in setup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java | 5 +++++
opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java | 5 ++++-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java
index e8d54a7..72dabb7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java
@@ -302,7 +302,10 @@
public static final String[] REQUIRED_DIRECTORIES = new String[] {
CONFIG_PATH_RELATIVE, DATABASES_PATH_RELATIVE, LIBRARIES_PATH_RELATIVE };
-
+ /**
+ * The default base DN prompted to user in setup interactive mode.
+ */
+ public static final String DEFAULT_INTERACTIVE_BASE_DN = "dc=example,dc=com";
/**
* Performs validation on the specified file to make sure that it is an actual
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 693a2dc..86d57a7 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
@@ -1243,6 +1243,11 @@
return NewSuffixOptions.createEmpty(new LinkedList<String>());
}
+ // Add default value for base DN on first prompt
+ if (argParser.baseDNArg.getDefaultValue() == null)
+ {
+ argParser.baseDNArg.setDefaultValue(Installation.DEFAULT_INTERACTIVE_BASE_DN);
+ }
// Check the validity of the base DNs
final List<String> baseDNs = promptIfRequiredForDNs(argParser.baseDNArg, INFO_INSTALLDS_PROMPT_BASEDN.get(), true);
return promptIfRequiredForDataOptions(baseDNs);
--
Gitblit v1.10.0