From 07572b1a1f310425277e769bc497f2256121f192 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Tue, 15 May 2007 20:32:42 +0000
Subject: [PATCH] This commit removes the Web Start version of the upgrader's ability to download arbitrary builds to be used for upgrading.  Instead, the Web Start version of upgrade will be tied to the  build version of upgrader.  This is necessary after discovering that attemping to perform internal communication with the directory server when the DS bit and the upgraders bits are of different versions is problematic.

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

diff --git a/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties b/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
index 02aa934..656b2cd 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
+++ b/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
@@ -169,9 +169,10 @@
 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.  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} \
+   to a newer version.  Use of this tool assumes that you have already downloaded an \
+   OpenDS install package (.zip) file.  You can also upgrade your server using \
+   the Java Web Start version of this tool by visiting the OpenDS web site at opends.org.\n\n\
+   Usage:  {0} {options} where {options} \
    include:\n\n\
      -V, --version\n    Display Directory Server version information.\n\
      -f, --file\n  Specifies an existing OpenDS package (.zip) \
@@ -905,10 +906,10 @@
 error-starting-server-with-no-connection-handlers=Error Starting Server with \
 no connection handlers: {0}.
 error-starting-server=Error Starting Directory Server.
-error-starting-server-in-windows=Could not connect to Server after Start.  \
+error-starting-server-in-windows=Could not connect to the server after requesting start.  \
 If you have a firewall configured check that it allows connections to port {0}.
-error-starting-server-in-unix=Could not connect to Server after Start.  \
-Verify that you have the rights to access to port {0}.
+error-starting-server-in-unix=Could not connect to the server after after requesting start.  \
+Verify that the server has access rights to port {0}.
 error-stopping-server=Error Stopping Directory Server.
 error-stopping-server-code=Error Stopping Directory Server.  Error code: {0}.
 error-reading-erroroutput=Error Reading error output.

--
Gitblit v1.10.0