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/server/tasks/ImportTask.java | 43 -------------------------------------------
1 files changed, 0 insertions(+), 43 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
index d00fcce..ff009bb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
@@ -80,8 +80,6 @@
argDisplayMap.put(ATTR_IMPORT_LDIF_FILE, INFO_IMPORT_ARG_LDIF_FILE.get());
argDisplayMap.put(ATTR_IMPORT_TEMPLATE_FILE, INFO_IMPORT_ARG_TEMPLATE_FILE.get());
argDisplayMap.put(ATTR_IMPORT_RANDOM_SEED, INFO_IMPORT_ARG_RANDOM_SEED.get());
- argDisplayMap.put(ATTR_IMPORT_APPEND, INFO_IMPORT_ARG_APPEND.get());
- argDisplayMap.put(ATTR_IMPORT_REPLACE_EXISTING, INFO_IMPORT_ARG_REPLACE_EXISTING.get());
argDisplayMap.put(ATTR_IMPORT_BACKEND_ID, INFO_IMPORT_ARG_BACKEND_ID.get());
argDisplayMap.put(ATTR_IMPORT_INCLUDE_BRANCH, INFO_IMPORT_ARG_INCL_BRANCH.get());
argDisplayMap.put(ATTR_IMPORT_EXCLUDE_BRANCH, INFO_IMPORT_ARG_EXCL_BRANCH.get());
@@ -99,11 +97,9 @@
}
- private boolean append;
private boolean isCompressed;
private boolean isEncrypted;
private boolean overwrite;
- private boolean replaceExisting;
private boolean skipSchemaValidation;
private boolean clearBackend;
private boolean skipDNValidation;
@@ -156,8 +152,6 @@
AttributeType typeLdifFile = getAttributeTypeOrDefault(ATTR_IMPORT_LDIF_FILE);
AttributeType typeTemplateFile = getAttributeTypeOrDefault(ATTR_IMPORT_TEMPLATE_FILE);
- AttributeType typeAppend = getAttributeTypeOrDefault(ATTR_IMPORT_APPEND);
- AttributeType typeReplaceExisting = getAttributeTypeOrDefault(ATTR_IMPORT_REPLACE_EXISTING);
AttributeType typeBackendID = getAttributeTypeOrDefault(ATTR_IMPORT_BACKEND_ID);
AttributeType typeIncludeBranch = getAttributeTypeOrDefault(ATTR_IMPORT_INCLUDE_BRANCH);
AttributeType typeExcludeBranch = getAttributeTypeOrDefault(ATTR_IMPORT_EXCLUDE_BRANCH);
@@ -212,10 +206,8 @@
}
}
- append = asBoolean(taskEntry, typeAppend);
skipDNValidation = asBoolean(taskEntry, typeDNCheckPhase2);
tmpDirectory = asString(taskEntry, typeTmpDirectory);
- replaceExisting = asBoolean(taskEntry, typeReplaceExisting);
backendID = asString(taskEntry, typeBackendID);
includeBranchStrings = asListOfStrings(taskEntry, typeIncludeBranch);
excludeBranchStrings = asListOfStrings(taskEntry, typeExcludeBranch);
@@ -333,22 +325,6 @@
LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_IMPORT.get(backendID);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
- // Make sure that if the "backendID" argument was provided, no include
- // base was included, and the "append" option was not provided, the
- // "clearBackend" argument was also provided if there are more then one
- // baseDNs for the backend being imported.
- else if(!append && includeBranchStrings.isEmpty() &&
- backend.getBaseDNs().length > 1 && !clearBackend)
- {
- StringBuilder builder = new StringBuilder();
- for(DN dn : backend.getBaseDNs())
- {
- builder.append(dn).append(" ");
- }
- LocalizableMessage message = ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND.get(
- builder, typeClearBackend.getNameOrOID());
- throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
- }
}
else
{
@@ -517,23 +493,6 @@
logger.error(ERR_LDIFIMPORT_CANNOT_IMPORT, backendID);
return TaskState.STOPPED_BY_ERROR;
}
- // Make sure that if the "backendID" argument was provided, no include
- // base was included, and the "append" option was not provided, the
- // "clearBackend" argument was also provided if there are more then one
- // baseDNs for the backend being imported.
- else if(!append && includeBranches.isEmpty() &&
- backend.getBaseDNs().length > 1 && !clearBackend)
- {
- StringBuilder builder = new StringBuilder();
- builder.append(backend.getBaseDNs()[0]);
- for(int i = 1; i < backend.getBaseDNs().length; i++)
- {
- builder.append(" / ");
- builder.append(backend.getBaseDNs()[i]);
- }
- logger.error(ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND, builder, ATTR_IMPORT_CLEAR_BACKEND);
- return TaskState.STOPPED_BY_ERROR;
- }
}
else
{
@@ -657,8 +616,6 @@
{
tmpDirectory = "import-tmp";
}
- importConfig.setAppendToExistingData(append);
- importConfig.setReplaceExistingEntries(replaceExisting);
importConfig.setCompressed(isCompressed);
importConfig.setEncrypted(isEncrypted);
importConfig.setClearBackend(clearBackend);
--
Gitblit v1.10.0