From 56f7fa2950663b0e26943b3f4460b33118fcd4f7 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 18 Oct 2007 23:02:53 +0000
Subject: [PATCH] Fix for issue 2452: Missing "rejected file" when importing data from LDIF
---
opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java b/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
index f5a0a57..f10572c 100644
--- a/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
+++ b/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
@@ -81,6 +81,8 @@
StringArgument configClassArg;
StringArgument configFileArg;
StringArgument importLDIFArg;
+ StringArgument rejectedImportFileArg;
+ StringArgument skippedImportFileArg;
StringArgument directoryManagerDNArg;
StringArgument directoryManagerPwdStringArg;
StringArgument useJavaKeyStoreArg;
@@ -188,6 +190,18 @@
INFO_INSTALLDS_DESCRIPTION_IMPORTLDIF.get());
addArgument(importLDIFArg);
+ rejectedImportFileArg = new StringArgument(
+ "rejectfile", 'R', "rejectFile", false, false,
+ true, "{rejectFile}", null, null,
+ INFO_INSTALLDS_DESCRIPTION_REJECTED_FILE.get());
+ addArgument(rejectedImportFileArg);
+
+ skippedImportFileArg = new StringArgument(
+ "skipFile", null, "skipFile", false, false,
+ true, "{skipFile}", null, null,
+ INFO_INSTALLDS_DESCRIPTION_SKIPPED_FILE.get());
+ addArgument(skippedImportFileArg);
+
sampleDataArg = new IntegerArgument(
"sampledata", 'd', "sampleData", false,
false, true, "{numEntries}", 0, null,
@@ -516,6 +530,36 @@
sampleDataArg.getLongIdentifier());
errorMessages.add(message);
}
+
+ if (rejectedImportFileArg.isPresent() && addBaseEntryArg.isPresent())
+ {
+ Message message = ERR_TOOL_CONFLICTING_ARGS.get(
+ addBaseEntryArg.getLongIdentifier(),
+ rejectedImportFileArg.getLongIdentifier());
+ errorMessages.add(message);
+ }
+ else if (rejectedImportFileArg.isPresent() && sampleDataArg.isPresent())
+ {
+ Message message = ERR_TOOL_CONFLICTING_ARGS.get(
+ rejectedImportFileArg.getLongIdentifier(),
+ sampleDataArg.getLongIdentifier());
+ errorMessages.add(message);
+ }
+
+ if (skippedImportFileArg.isPresent() && addBaseEntryArg.isPresent())
+ {
+ Message message = ERR_TOOL_CONFLICTING_ARGS.get(
+ addBaseEntryArg.getLongIdentifier(),
+ skippedImportFileArg.getLongIdentifier());
+ errorMessages.add(message);
+ }
+ else if (skippedImportFileArg.isPresent() && sampleDataArg.isPresent())
+ {
+ Message message = ERR_TOOL_CONFLICTING_ARGS.get(
+ skippedImportFileArg.getLongIdentifier(),
+ sampleDataArg.getLongIdentifier());
+ errorMessages.add(message);
+ }
}
/**
--
Gitblit v1.10.0