From 50d67e394dd8d3786ab12cc4ba4be1010519340b Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 03 May 2007 17:53:59 +0000
Subject: [PATCH] removed irrelevant --cli option from upgrader
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgraderCliHelper.java | 11 +++--------
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java | 7 +++++++
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties | 9 +++++----
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
index 48a8c58..2e07a86 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
@@ -160,11 +160,12 @@
upgrade-launcher-description=This utility may be used to upgrade the Directory \
Server to a newer version.
upgrade-launcher-usage=This utility may be used to upgrade the Directory Server \
- to a newer version.\nUsage: {0} {options} where {options} \
+ to a newer version. If no options are specified on the command line, the \
+ graphical version of this tool will launch. Otherwise the the command line \
+ version will be launched.\n\nUsage: {0} {options} where {options} \
include:\n\n -f, --file\n Specifies an existing OpenDS package (.zip) \
- file to which the\n current build will be upgraded.\n\n -c, --cli\n \
- Use the command line upgrade. If not specified the graphical\n interface \
- will be launched.\n
+ file to which the\n current build will be upgraded using the command line \
+ \n version of this tool\n
upgrade-launcher-launching-gui=Launching graphical upgrade...
upgrade-launcher-launching-cli=Launching command line upgrade...
upgrade-launcher-gui-launched-failed=\n\nThe graphical upgrade launch \
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
index 79b4d1c..38c2648 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
@@ -79,6 +79,13 @@
/**
* {@inheritDoc}
*/
+ protected boolean isCli() {
+ return args.length > 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
protected void printUsage() {
String arg;
if (Utils.isWindows()) {
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgraderCliHelper.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgraderCliHelper.java
index bb35cf8..486034e 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgraderCliHelper.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgraderCliHelper.java
@@ -31,7 +31,6 @@
import org.opends.quicksetup.UserDataException;
import org.opends.quicksetup.CurrentInstallStatus;
import org.opends.server.util.args.ArgumentParser;
-import org.opends.server.util.args.BooleanArgument;
import org.opends.server.util.args.StringArgument;
import org.opends.server.util.args.ArgumentException;
@@ -52,8 +51,7 @@
static private final Logger LOG =
Logger.getLogger(UpgraderCliHelper.class.getName());
- BooleanArgument cliArg = null;
- BooleanArgument dryRunArg = null;
+
StringArgument localInstallPackFileNameArg = null;
/**
@@ -85,7 +83,8 @@
} else {
// TODO i18N
throw new UserDataException(null,
- "-f must be present");
+ "Option -f is required for the command line version of the " +
+ "upgrade tool.");
}
} catch (ArgumentException e) {
@@ -108,10 +107,6 @@
// parser.
// try {
try {
- cliArg =
- new BooleanArgument("cli", 'c', "cli", 0);
- argParser.addArgument(cliArg);
-
localInstallPackFileNameArg =
new StringArgument("install package file",
FILE_OPTION_SHORT, FILE_OPTION_LONG,
--
Gitblit v1.10.0