From d6ea0e16a3e4ef9eb27b411d1b98b53c540f9323 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 16 Nov 2006 17:37:40 +0000
Subject: [PATCH] Add a new "--cli" option to InstallDS in order to provide consistency when displaying usage information in the new installer.
---
opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java | 11 +++++++++++
opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java | 7 +++++++
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java
index e7b3fec..c0f0b5e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java
@@ -7342,6 +7342,15 @@
/**
+ * The message ID for the message that will be used as the description for the
+ * cli argument. This does not take any arguments.
+ */
+ public static final int MSGID_INSTALLDS_DESCRIPTION_CLI =
+ CATEGORY_MASK_TOOLS | SEVERITY_MASK_INFORMATIONAL | 752;
+
+
+
+ /**
* Associates a set of generic messages with the message IDs defined in this
* class.
*/
@@ -8848,6 +8857,8 @@
"the Directory Server configuration handler. If this is " +
"not provided, then a default of " +
ConfigFileHandler.class.getName() + " will be used.");
+ registerMessage(MSGID_INSTALLDS_DESCRIPTION_CLI,
+ "Launch the installer in command-line mode (no GUI).");
registerMessage(MSGID_INSTALLDS_DESCRIPTION_SILENT,
"Perform a silent installation.");
registerMessage(MSGID_INSTALLDS_DESCRIPTION_BASEDN,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
index fb66501..54b351c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -152,6 +152,7 @@
ArgumentParser argParser = new ArgumentParser(CLASS_NAME, toolDescription,
false);
BooleanArgument addBaseEntry;
+ BooleanArgument cliMode;
BooleanArgument testOnly;
BooleanArgument showUsage;
BooleanArgument silentInstall;
@@ -192,6 +193,12 @@
configClass.setHidden(true);
argParser.addArgument(configClass);
+ // NOTE: This argument isn't actually used for anything, but it provides
+ // consistency with the setup script, which does take a --cli option.
+ cliMode = new BooleanArgument("cli", null, "cli",
+ MSGID_INSTALLDS_DESCRIPTION_CLI);
+ argParser.addArgument(cliMode);
+
silentInstall = new BooleanArgument("silent", 's', "silentInstall",
MSGID_INSTALLDS_DESCRIPTION_SILENT);
argParser.addArgument(silentInstall);
--
Gitblit v1.10.0