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/test/java/org/opends/server/tasks/TestImportAndExport.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestImportAndExport.java b/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestImportAndExport.java
index 1180389..23caa5c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestImportAndExport.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestImportAndExport.java
@@ -191,8 +191,6 @@
                    "ds-task-import-is-encrypted: FALSE",
                    "ds-task-import-reject-file: " + rejectFile.getPath(),
                    "ds-task-import-overwrite-rejects: FALSE",
-                   "ds-task-import-append: TRUE",
-                   "ds-task-import-replace-existing: TRUE",
                    "ds-task-import-skip-schema-validation: TRUE",
                    "ds-task-import-include-branch: dc=example,dc=com",
                    "ds-task-import-exclude-branch: o=exclude,dc=example,dc=com",

--
Gitblit v1.10.0