From 426f6fff96db9c07683e5a27b8b745b3e13c29ff Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Fri, 08 Jun 2007 19:15:27 +0000
Subject: [PATCH] This commit address several related issues regarding the upgrader CLI:

---
 opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties b/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
index 62b7df0..dd50171 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
+++ b/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
@@ -176,9 +176,10 @@
      -V, --version\n    Display Directory Server version information.\n\
      -f, --file\n    Specifies an existing OpenDS package (.zip) \
    file to which the\n    current build will be upgraded using the command line \
-   \n    version of this tool\n-n, --noninteractive\n    If this tool requires more \
-   information to complete successfully\n    it will fail instead of prompting.\
-   \n-?, -H , --help\n    Display this usage information.\n
+   \n    version of this tool\n-i, --interactive\n    Prompt for any required \
+   information rather than fail\
+   \n-s, --silent\n    Perform a silent upgrade\n-?, -H , --help\n    Display \
+   this usage information.\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 \
@@ -1162,6 +1163,9 @@
   Either the selected directory is not a valid OpenDS root installation\n\
   directory or you do not have access permissions for this directory.
 error-option-required=Option {0} is required.
+error-option-required-or-interactive=Option {0} is required when not invoking \
+  this command in interactive mode.  See the usage statement.
+
 error-parsing-options=Error parsing options.
 error-install-root-dir-null=The root directory is null.
 error-install-root-dir-not-dir=File {0} is not an OpenDS installation root.
@@ -1169,7 +1173,7 @@
 error-install-root-dir-no-dir=Directory {0} does not contain directory {1}.
 error-install-root-dir-empty=Directory {0} is either empty or you lack permissions\
   to access its contents.
-
+error-empty-response=ERROR:  The response value may not be an empty string
 
 #
 # Install Status: messages displayed in the offline quick setup
@@ -1209,6 +1213,7 @@
   made to the server by this upgrade will be backed out.
 upgrade-verification-failure-cancel=Cancel Upgrade
 upgrade-verification-failure-view-details=View Error Details
+upgrade-file-prompt=Enter the name and path of the OpenDS install file (.zip):
 
 #
 # Upgrader Panels
@@ -1282,6 +1287,9 @@
 # Build extractor
 build-extractor-error=Failed to extract build: {0}
 build-extractor-error-file-no-exist=File {0} does not exist.
+build-extractor-error-file-not-zip=File {0} is not a .zip file.
+build-extractor-file-invalid=Could not extract a valid OpenDS installation from \
+  {0} because: {1}
 
 # Web Proxy dialog strings
 web-proxy-dlg-title=Web Proxy Configuration
@@ -1302,6 +1310,7 @@
 upgrade-log-status-started=Started
 upgrade-log-status-success=Success
 upgrade-log-status-failure=Failure
+upgrade-log-status-cancel=Canceled
 
 general-loading=Loading...
 general-see-for-details=See {0} for a detailed log of this operation.

--
Gitblit v1.10.0