From b6e0d10650364c569020e948dfbcaf4405e34a9e Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 13 Jun 2008 11:03:18 +0000
Subject: [PATCH] Fix for 3338 (upgrade breaks the java_home parameter)
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
index 3aca262..5c5e070 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
@@ -69,6 +69,7 @@
import org.opends.quicksetup.ui.FieldName;
import org.opends.quicksetup.upgrader.ui.UpgraderReviewPanel;
import org.opends.quicksetup.upgrader.ui.WelcomePanel;
+import org.opends.server.tools.JavaPropertiesTool;
import java.awt.event.WindowEvent;
import java.io.File;
@@ -709,6 +710,9 @@
checkAbort();
+ getUserData().setStartServer(
+ getInstallation().getStatus().isServerRunning());
+
try {
LOG.log(Level.INFO, "initializing upgrade");
setCurrentProgressStep(UpgradeProgressStep.INITIALIZING);
@@ -903,6 +907,41 @@
}
}
+ if (migration.mustRunDSJavaProperties())
+ {
+ try {
+ LOG.log(Level.INFO, "Upgrading script with java properties");
+// Launch the script
+ String propertiesFile = new File(
+ getInstallation().getConfigurationDirectory(),
+ Installation.DEFAULT_JAVA_PROPERTIES_FILE).getAbsolutePath();
+ String setJavaFile =
+ getInstallation().getSetJavaHomeFile().getAbsolutePath();
+ String[] args =
+ {
+ "--propertiesFile", propertiesFile,
+ "--destinationFile", setJavaFile,
+ "--quiet"
+ };
+
+ int returnValue = JavaPropertiesTool.mainCLI(args);
+
+ if ((returnValue !=
+ JavaPropertiesTool.ErrorReturnCode.SUCCESSFUL.getReturnCode()) &&
+ returnValue !=
+ JavaPropertiesTool.ErrorReturnCode.SUCCESSFUL_NOP.getReturnCode())
+ {
+ throw new ApplicationException(ReturnCode.APPLICATION_ERROR,
+ ERR_ERROR_CREATING_JAVA_HOME_SCRIPTS.get(returnValue), null);
+ }
+ LOG.log(Level.INFO, "scripts successfully upgraded");
+ } catch (ApplicationException e) {
+ LOG.log(Level.INFO,
+ "Error upgrading scripts", e);
+ throw e;
+ }
+ }
+
checkAbort();
try {
--
Gitblit v1.10.0