From 3dfb061cbafd3a97c9359f739942924a8ee525f1 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 02 Nov 2011 12:07:15 +0000
Subject: [PATCH] Fix for OPENDJ-222 : Renamed environment variables to OPENDJ_... Updated scripts so that if OPENDJ_JAVA_HOME and OPENDJ_JAVA_ARGS are not defined, we look at the legacy OPENDS_... ones.
---
opends/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
index 030df19..62371c0 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.quicksetup.installer.ui;
@@ -763,7 +764,7 @@
String javaHome = System.getProperty("java.home");
if ((javaHome == null) || (javaHome.length() == 0))
{
- javaHome = System.getenv(SetupUtils.OPENDS_JAVA_HOME);
+ javaHome = System.getenv(SetupUtils.OPENDJ_JAVA_HOME);
}
if (!Utils.supportsOption(options, javaHome, INSTALL_PATH))
{
--
Gitblit v1.10.0