From 950f927644139bbc8805c518dff2cd80cc3bcb6e Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Thu, 09 Apr 2015 12:41:47 +0000
Subject: [PATCH] OPENDJ-1714 (CR-6595) UI setup backend type choice
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
index 6211a84..2e2ad0a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
@@ -60,6 +60,8 @@
import org.opends.server.util.SetupUtils;
import org.opends.server.util.StaticUtils;
+import com.forgerock.opendj.cli.ArgumentConstants;
+
import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.util.OperatingSystem.*;
@@ -1379,6 +1381,7 @@
final DataReplicationOptions repl = userInstallData.getReplicationOptions();
final SuffixesToReplicateOptions suf = userInstallData.getSuffixesToReplicateOptions();
+ final String backendType = userInstallData.getBackendType();
boolean createSuffix = repl.getType() == DataReplicationOptions.Type.FIRST_IN_TOPOLOGY
|| repl.getType() == DataReplicationOptions.Type.STANDALONE
@@ -1417,11 +1420,12 @@
}
else if (options.getBaseDns().size() > 1)
{
- msg = INFO_REVIEW_CREATE_SUFFIX.get(joinAsString(Constants.LINE_SEPARATOR, options.getBaseDns()), arg2);
+ msg = INFO_REVIEW_CREATE_SUFFIX.get(
+ backendType, joinAsString(Constants.LINE_SEPARATOR, options.getBaseDns()), arg2);
}
else
{
- msg = INFO_REVIEW_CREATE_SUFFIX.get(options.getBaseDns().getFirst(), arg2);
+ msg = INFO_REVIEW_CREATE_SUFFIX.get(backendType, options.getBaseDns().getFirst(), arg2);
}
}
else
@@ -1631,7 +1635,14 @@
cmdLine.add(getInstallDir(userData) + getSetupFilename());
cmdLine.add("--cli");
- for (final String baseDN : getBaseDNs(userData))
+ final List<String> baseDNs = getBaseDNs(userData);
+ if (!baseDNs.isEmpty())
+ {
+ cmdLine.add("--" + ArgumentConstants.OPTION_LONG_BACKEND_TYPE);
+ cmdLine.add(userData.getBackendType());
+ }
+
+ for (final String baseDN : baseDNs)
{
cmdLine.add("--baseDN");
cmdLine.add(baseDN);
--
Gitblit v1.10.0