From a1e512ef865ec80cd47acb2ab3cb9e4df4365c2d Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 13 Feb 2014 15:08:57 +0000
Subject: [PATCH] minor commit for OPENDJ-1343 Migrate dsconfig / OPENDJ-1303 "opendj-cli" - added arguments constants. - fixed unit test due to change in Operating System. - added messages.
---
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java | 15 +++++++++++++++
opendj-sdk/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties | 1 +
opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java | 4 ++++
3 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java
index 7ac76ce..b3c2445 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java
@@ -615,6 +615,21 @@
*/
public static final String OPTION_LONG_CONNECT_TIMEOUT = "connectTimeout";
+ /**
+ * The value for the long option advanced.
+ */
+ public static final String OPTION_DSCFG_LONG_ADVANCED = "advanced";
+
+ /**
+ * Display the equivalent non-interactive command.
+ */
+ public static final String OPTION_LONG_DISPLAY_EQUIVALENT = "displayCommand";
+
+ /**
+ * The path where we write the equivalent non-interactive command.
+ */
+ public static final String OPTION_LONG_EQUIVALENT_COMMAND_FILE_PATH = "commandFilePath";
+
// Prevent instantiation.
private ArgumentConstants() {
diff --git a/opendj-sdk/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties b/opendj-sdk/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
index 7fe48b8..c521b3b 100755
--- a/opendj-sdk/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
+++ b/opendj-sdk/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
@@ -489,6 +489,7 @@
INFO_CONSTANT_PLACEHOLDER={name=value}
INFO_SEED_PLACEHOLDER={seed}
INFO_PATH_PLACEHOLDER={path}
+INFO_BATCH_FILE_PATH_PLACEHOLDER={batchFilePath}
INFO_MAKELDIF_DESCRIPTION_CONSTANT=A constant that overrides the value \
set in the template file
INFO_MAKELDIF_DESCRIPTION_LDIF=The path to the LDIF file to be written
diff --git a/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java b/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java
index 4b291a6..3d76afd 100644
--- a/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java
+++ b/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java
@@ -32,6 +32,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.testng.annotations.Test;
+import com.forgerock.opendj.util.OperatingSystem;
+
import static org.fest.assertions.Assertions.assertThat;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -60,6 +62,8 @@
}
final static MockConsoleApplication getDefault() {
+ // The console app needs the operating system.
+ OperatingSystem.getOperatingSystem();
out = new ByteArrayOutputStream();
final PrintStream psOut = new PrintStream(out);
err = new ByteArrayOutputStream();
--
Gitblit v1.10.0