From 311137a4703c3a69572cc911068da2930331a056 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 21 Feb 2014 16:03:36 +0000
Subject: [PATCH] Checkpoint for OPENDJ-1303 "opendj-cli" - Fixed build in SetupCli. Added message + replaced importLDIF to getLDIFFile.
---
opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java | 2 +-
opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
index 31eabbe..82202e8 100755
--- a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
+++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
@@ -840,4 +840,7 @@
to delete
INFO_DESCRIPTION_TIME_LIMIT=Maximum length of \
time (in seconds) to spend processing
+INFO_DESCRIPTION_IMPORTLDIF=Path to an LDIF file \
+ containing data that should be added to the Directory Server database. \
+ Multiple LDIF files may be provided by using this option multiple times
diff --git a/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java b/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java
index 47edaaa..4d0e2e2 100644
--- a/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java
+++ b/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java
@@ -225,7 +225,7 @@
cli = addGlobal(CommonArguments.getCLI());
baseDN = addGlobal(CommonArguments.getBaseDN());
addBaseEntry = addGlobal(CommonArguments.getAddBaseEntry());
- importLDIF = addGlobal(CommonArguments.getImportLDIF());
+ importLDIF = addGlobal(CommonArguments.getLDIFFile(INFO_DESCRIPTION_IMPORTLDIF.get()));
rejectedImportFile = addGlobal(CommonArguments.getRejectedImportLdif());
skippedImportFile = addGlobal(CommonArguments.getSkippedImportFile());
sampleData = addGlobal(CommonArguments.getSampleData());
--
Gitblit v1.10.0