From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
index fa80cbd..5a22bec 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
@@ -282,7 +282,8 @@
* {@inheritDoc}
*/
public Message getFrameTitle() {
- return INFO_FRAME_UPGRADE_TITLE.get();
+ return Utils.getCustomizedObject("INFO_FRAME_UPGRADE_TITLE",
+ INFO_FRAME_UPGRADE_TITLE.get(), Message.class);
}
/**
@@ -821,16 +822,9 @@
// Check license
if (!LicenseFile.isAlreadyApproved())
{
- // Opends 1.2 upgrade: INSTALL_ROOT is set as a java CLI property.
- String installRootFromSystem = System.getProperty("INSTALL_ROOT");
-
- if (installRootFromSystem == null)
- {
- // Opends 1.0 upgrade: INSTALL_ROOT is not set.
- installRootFromSystem = System.getenv("INSTANCE_ROOT");
- }
- System.setProperty("INSTALL_ROOT", installRootFromSystem
- + File.separator + "tmp" + File.separator + "upgrade");
+ String currentInstallRoot = System.getProperty("INSTALL_ROOT");
+ System.setProperty("INSTALL_ROOT",
+ getStageDirectory().getAbsolutePath());
if (LicenseFile.exists())
{
String licenseString = LicenseFile.getText();
@@ -880,7 +874,11 @@
}
}
}
- System.setProperty("INSTALL_ROOT", installRootFromSystem);
+ if (currentInstallRoot != null) {
+ System.setProperty("INSTALL_ROOT", currentInstallRoot);
+ } else {
+ System.clearProperty("INSTALL_ROOT");
+ }
}
if (!Utils.isWebStart())
--
Gitblit v1.10.0