From 7971d7f22c12dc126b0c7098be194f4ab251b78b Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 10 Dec 2015 10:52:25 +0000
Subject: [PATCH] OPENDJ-2521 - Unable to import data into new backend/baseDN using control panel. With pluggable backends, the import code no longer support the --append Mode (and the replaceExisting option). ImportLDIF.java: Remove the append and replaceExisting options ImportTask.java: Remove the append and replaceExisting options and checks done with these options ControlPanel/NewBaseDNPanel: Remove call to --append option ControlPanel/ImportLDIFPanel: Remove code and UI elements that deal with the append and replaceExisting options TestImportAndExport.java: Remove use of append and replaceExisting options admin_tool*.properties: Remove the labels removed from the Control Panel UI.
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java | 113 +-------------------------------------------------------
1 files changed, 2 insertions(+), 111 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
index b95f6bf..b576a98 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
@@ -40,13 +40,11 @@
import java.util.Set;
import java.util.TreeSet;
-import javax.swing.ButtonGroup;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JLabel;
-import javax.swing.JRadioButton;
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent;
@@ -82,9 +80,6 @@
private JComboBox backends;
private JTextField file;
private JCheckBox dataCompressed;
- private JRadioButton overwrite;
- private JRadioButton append;
- private JCheckBox replaceEntries;
private JCheckBox rejectNotSchemaCompliant;
private JCheckBox doDNValidationAfter;
private JCheckBox writeRejects;
@@ -101,7 +96,6 @@
private JLabel lBackend;
private JLabel lNoBackendsFound;
private JLabel lFile;
- private JLabel lImportType;
private JLabel lSchemaValidation;
private JLabel lDNValidation;
private JLabel lThreads;
@@ -199,7 +193,7 @@
public void changedUpdate(DocumentEvent ev)
{
String text = file.getText().trim();
- setEnabledOK(text != null && text.length() > 0 && !errorPane.isVisible());
+ setEnabledOK(text.length() > 0 && !errorPane.isVisible());
}
/** {@inheritDoc} */
@Override
@@ -254,52 +248,6 @@
gbc.insets.left = 0;
gbc.insets.top = 10;
gbc.gridwidth = 1;
- lImportType = Utilities.createPrimaryLabel(
- INFO_CTRL_PANEL_IMPORT_TYPE_LABEL.get());
- add(lImportType, gbc);
-
- overwrite = Utilities.createRadioButton(
- INFO_CTRL_PANEL_IMPORT_OVERWRITE_LABEL.get());
- overwrite.setSelected(true);
- lImportType.setLabelFor(overwrite);
-
- append =
- Utilities.createRadioButton(INFO_CTRL_PANEL_IMPORT_APPEND_LABEL.get());
-
- ButtonGroup group = new ButtonGroup();
- group.add(overwrite);
- group.add(append);
-
- gbc.insets.left = 10;
- gbc.gridx = 1;
- gbc.gridwidth = 2;
- add(overwrite, gbc);
- gbc.gridy ++;
- gbc.insets.top = 5;
- add(append, gbc);
- append.addChangeListener(new ChangeListener()
- {
- /** {@inheritDoc} */
- @Override
- public void stateChanged(ChangeEvent ev)
- {
- replaceEntries.setEnabled(append.isSelected());
- }
- });
-
- replaceEntries =
- Utilities.createCheckBox(INFO_CTRL_PANEL_IMPORT_REPLACE_ENTRIES.get());
- replaceEntries.setOpaque(false);
- replaceEntries.setEnabled(false);
- gbc.insets.left = 30;
- gbc.gridy ++;
- add(replaceEntries, gbc);
-
- gbc.gridx = 0;
- gbc.gridy ++;
- gbc.insets.left = 0;
- gbc.insets.top = 10;
- gbc.gridwidth = 1;
lSchemaValidation = Utilities.createPrimaryLabel(
INFO_CTRL_PANEL_SCHEMA_VALIDATION_LABEL.get());
add(lSchemaValidation, gbc);
@@ -642,21 +590,13 @@
{
task.canLaunch(newTask, errors);
}
- boolean confirmed = true;
boolean initializeAll = false;
if (errors.isEmpty())
{
Set<DN> replicatedBaseDNs = getReplicatedBaseDNs();
boolean canInitialize =
!replicatedBaseDNs.isEmpty() && isServerRunning();
- if (overwrite.isSelected() && !canInitialize)
- {
- confirmed = displayConfirmationDialog(
- INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
- INFO_CTRL_PANEL_CONFIRMATION_IMPORT_LDIF_DETAILS.get(
- backendName));
- }
- else if (!overwrite.isSelected() && canInitialize)
+ if (canInitialize)
{
ArrayList<String> dns = new ArrayList<>();
for (DN dn : replicatedBaseDNs)
@@ -668,43 +608,7 @@
INFO_CTRL_PANEL_CONFIRMATION_INITIALIZE_ALL_DETAILS.get(
Utilities.getStringFromCollection(dns, "<br>")));
}
- else if (overwrite.isSelected() && canInitialize)
- {
- ArrayList<String> dns = new ArrayList<>();
- for (DN dn : replicatedBaseDNs)
- {
- dns.add(dn.toString());
- }
- ConfirmInitializeAndImportDialog dlg =
- new ConfirmInitializeAndImportDialog(
- Utilities.getParentDialog(this), getInfo());
- dlg.setMessage(INFO_CTRL_PANEL_CONFIRM_INITIALIZE_TITLE.get(),
- INFO_CTRL_PANEL_CONFIRMATION_INITIALIZE_ALL_AND_OVERWRITE_DETAILS.get(
- backendName, Utilities.getStringFromCollection(dns, "<br>")));
- dlg.setModal(true);
- dlg.setVisible(true);
- ConfirmInitializeAndImportDialog.Result result = dlg.getResult();
- switch (result)
- {
- case CANCEL:
- confirmed = false;
- break;
- case INITIALIZE_ALL:
- confirmed = true;
- initializeAll = true;
- break;
- case IMPORT_ONLY:
- confirmed = true;
- initializeAll = false;
- break;
- default:
- throw new RuntimeException("Unexpected result: "+result);
- }
- }
- }
- if (errors.isEmpty() && confirmed)
- {
newTask.setInitializeAll(initializeAll);
launchOperation(newTask,
INFO_CTRL_PANEL_IMPORTING_LDIF_SUMMARY.get(backends.getSelectedItem()),
@@ -730,7 +634,6 @@
{
setPrimaryValid(lBackend);
setPrimaryValid(lFile);
- setPrimaryValid(lImportType);
setPrimaryValid(lSchemaValidation);
setPrimaryValid(lDNValidation);
setPrimaryValid(lThreads);
@@ -842,18 +745,6 @@
{
args.add("--isCompressed");
}
- if (overwrite.isSelected())
- {
- args.add("--clearBackend");
- }
- if (append.isSelected())
- {
- args.add("--append");
- if (replaceEntries.isSelected())
- {
- args.add("--replaceExisting");
- }
- }
if (!rejectNotSchemaCompliant.isSelected())
{
args.add("--skipSchemaValidation");
--
Gitblit v1.10.0