From 5e7c2e08044de85ed9a8da34b2ed8634201e2db7 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.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/UpgraderReviewPanel.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/UpgraderReviewPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/UpgraderReviewPanel.java
index 439fdd1..4b2077c 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/UpgraderReviewPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/UpgraderReviewPanel.java
@@ -28,18 +28,20 @@
package org.opends.quicksetup.upgrader.ui;
import org.opends.quicksetup.UserData;
+import org.opends.quicksetup.BuildInformation;
+import org.opends.quicksetup.ApplicationException;
+import org.opends.quicksetup.i18n.ResourceProvider;
import org.opends.quicksetup.ui.FieldName;
import org.opends.quicksetup.ui.LabelFieldDescriptor;
import org.opends.quicksetup.ui.ReviewPanel;
import org.opends.quicksetup.ui.UIFactory;
-import org.opends.quicksetup.upgrader.Build;
-import org.opends.quicksetup.upgrader.UpgradeUserData;
import org.opends.quicksetup.upgrader.Upgrader;
import org.opends.quicksetup.util.Utils;
import javax.swing.*;
import java.awt.*;
import java.util.logging.Logger;
+import java.util.logging.Level;
/**
* Presents upgrade information to the user to confirm before starting the
@@ -209,16 +211,20 @@
* @return String indicating the new build
*/
private String getNewBuildString() {
- String newVersion;
- UpgradeUserData uud = (UpgradeUserData)getUserData();
- Build build = uud.getInstallPackageToDownload();
- if (build != null) {
- newVersion = build.getDisplayName();
- } else {
- // TODO: figure out the build from the zip somehow
- newVersion = getMsg("upgrade-build-id-unknown");
+ String b = null;
+ try {
+ BuildInformation bi = BuildInformation.getCurrent();
+ if (bi != null) {
+ b = bi.toString();
+ }
+ } catch (ApplicationException e) {
+ LOG.log(Level.INFO, "error trying to determine new build string", e);
}
- return newVersion;
+ if (b == null) {
+ b = ResourceProvider.getInstance().
+ getMsg("upgrade-build-id-unknown");
+ }
+ return b;
}
/**
--
Gitblit v1.10.0