From f06c1ba3e5ea8499b699bae1e128a022b320bf6c Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 12 May 2015 15:28:27 +0000
Subject: [PATCH] OPENDJ-1997 setup: leave database empty by default
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataOptionsPanel.java | 6 +++---
opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java | 3 +--
opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java | 12 ++++++------
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
index 3cb7076..01326ef 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
@@ -126,8 +126,7 @@
LinkedList<String> baseDn = new LinkedList<String>();
baseDn.add("dc=example,dc=com");
- NewSuffixOptions defaultNewSuffixOptions = NewSuffixOptions.createBaseEntry(
- baseDn);
+ NewSuffixOptions defaultNewSuffixOptions = NewSuffixOptions.createEmpty(baseDn);
setNewSuffixOptions(defaultNewSuffixOptions);
// See what we can propose as port
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataOptionsPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataOptionsPanel.java
index 5275055..47c436d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataOptionsPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataOptionsPanel.java
@@ -273,9 +273,9 @@
gbc.insets = UIFactory.getEmptyInsets();
gbc.weightx = 1.0;
gbc.fill = GridBagConstraints.HORIZONTAL;
- panel.add(getRadioButton(NewSuffixOptions.Type.CREATE_BASE_ENTRY), gbc);
- gbc.insets.top = UIFactory.TOP_INSET_RADIOBUTTON;
panel.add(getRadioButton(NewSuffixOptions.Type.LEAVE_DATABASE_EMPTY), gbc);
+ gbc.insets.top = UIFactory.TOP_INSET_RADIOBUTTON;
+ panel.add(getRadioButton(NewSuffixOptions.Type.CREATE_BASE_ENTRY), gbc);
panel.add(getRadioButton(NewSuffixOptions.Type.IMPORT_FROM_LDIF_FILE), gbc);
JPanel auxPanel = createBrowseButtonPanel(FieldName.LDIF_PATH, getLDIFBrowseButton());
@@ -454,13 +454,13 @@
INFO_CREATE_BASE_ENTRY_TOOLTIP.get(),
UIFactory.TextStyle.SECONDARY_FIELD_VALID);
hmRadioButtons.put(NewSuffixOptions.Type.CREATE_BASE_ENTRY, createBaseEntryRB);
- dataLabel.setLabelFor(createBaseEntryRB);
final JRadioButton leaveDataBaseEmptyRB = UIFactory.makeJRadioButton(
INFO_LEAVE_DATABASE_EMPTY_LABEL.get(),
INFO_LEAVE_DATABASE_EMPTY_TOOLTIP.get(),
UIFactory.TextStyle.SECONDARY_FIELD_VALID);
hmRadioButtons.put(NewSuffixOptions.Type.LEAVE_DATABASE_EMPTY, leaveDataBaseEmptyRB);
+ dataLabel.setLabelFor(leaveDataBaseEmptyRB);
final JRadioButton importFileDataRB = UIFactory.makeJRadioButton(
INFO_IMPORT_DATA_FROM_LDIF_LABEL.get(),
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 3f9e7d4..2b69ef5 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
@@ -1389,16 +1389,16 @@
}
else
{
- final int POPULATE_TYPE_BASE_ONLY = 1;
- final int POPULATE_TYPE_LEAVE_EMPTY = 2;
+ final int POPULATE_TYPE_LEAVE_EMPTY = 1;
+ final int POPULATE_TYPE_BASE_ONLY = 2;
final int POPULATE_TYPE_IMPORT_FROM_LDIF = 3;
final int POPULATE_TYPE_GENERATE_SAMPLE_DATA = 4;
- final int[] indexes = {POPULATE_TYPE_BASE_ONLY, POPULATE_TYPE_LEAVE_EMPTY,
+ final int[] indexes = {POPULATE_TYPE_LEAVE_EMPTY, POPULATE_TYPE_BASE_ONLY,
POPULATE_TYPE_IMPORT_FROM_LDIF, POPULATE_TYPE_GENERATE_SAMPLE_DATA};
final LocalizableMessage[] msgs = new LocalizableMessage[] {
- INFO_INSTALLDS_POPULATE_OPTION_BASE_ONLY.get(),
INFO_INSTALLDS_POPULATE_OPTION_LEAVE_EMPTY.get(),
+ INFO_INSTALLDS_POPULATE_OPTION_BASE_ONLY.get(),
INFO_INSTALLDS_POPULATE_OPTION_IMPORT_LDIF.get(),
INFO_INSTALLDS_POPULATE_OPTION_GENERATE_SAMPLE.get()
};
@@ -1414,8 +1414,8 @@
if (lastResetPopulateOption == null)
{
builder.setDefault(LocalizableMessage.raw(
- String.valueOf(POPULATE_TYPE_BASE_ONLY)),
- MenuResult.success(POPULATE_TYPE_BASE_ONLY));
+ String.valueOf(POPULATE_TYPE_LEAVE_EMPTY)),
+ MenuResult.success(POPULATE_TYPE_LEAVE_EMPTY));
}
else
{
--
Gitblit v1.10.0