From f54aeb79b0f90d550c8cdcac5bfc22d4fc4579ce Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 12 Apr 2007 21:17:33 +0000
Subject: [PATCH] - The upgrader now contains a small companion program BuildExtractor that is run prior to Upgrader that extacts the user specified build file. This is done to allow upgrader to run from the new builds bits as opposed to the current build's bits.
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgraderCliHelper.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgraderCliHelper.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgraderCliHelper.java
index 10787e5..a1bd1f7 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgraderCliHelper.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgraderCliHelper.java
@@ -44,12 +44,17 @@
*/
public class UpgraderCliHelper extends CliApplicationHelper {
+ /** Short form of the option for specifying the installation package file. */
+ static public final Character FILE_OPTION_SHORT = 'F';
+
+ /** Long form of the option for specifying the installation package file. */
+ static public final String FILE_OPTION_LONG = "file";
+
static private final Logger LOG =
Logger.getLogger(UpgraderCliHelper.class.getName());
BooleanArgument cliArg = null;
BooleanArgument dryRunArg = null;
StringArgument localInstallPackFileNameArg = null;
- StringArgument remoteBuildNameArg = null;
/**
* Creates a set of user data from command line arguments and installation
@@ -77,12 +82,10 @@
} else {
uud.setInstallPackage(installPackFile);
}
- } else if (remoteBuildNameArg.isPresent()) {
- // TODO download build
} else {
// TODO i18N
throw new UserDataException(null,
- "either -F or -B option must be present");
+ "-F must be present");
}
} catch (ArgumentException e) {
@@ -110,15 +113,11 @@
argParser.addArgument(cliArg);
localInstallPackFileNameArg =
- new StringArgument("install package file", 'F', "package file",
+ new StringArgument("install package file",
+ FILE_OPTION_SHORT, FILE_OPTION_LONG,
false, true, "{install package file}", 0);
argParser.addArgument(localInstallPackFileNameArg);
- remoteBuildNameArg =
- new StringArgument("build name", 'B', "build name",
- false, false, "{build name}", 1);
- argParser.addArgument(remoteBuildNameArg);
-
} catch (ArgumentException e) {
LOG.log(Level.INFO, "error", e);
}
--
Gitblit v1.10.0