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/ui/QuickSetup.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java b/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
index 0b87aba..ecd21da 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.quicksetup.ui;
@@ -414,7 +415,7 @@
pb = new ProcessBuilder(cmd);
}
Map<String, String> env = pb.environment();
- env.put(SetupUtils.OPENDS_JAVA_HOME, System.getProperty("java.home"));
+ env.put(SetupUtils.OPENDJ_JAVA_HOME, System.getProperty("java.home"));
Process process = pb.start();
/**
* Wait for 3 seconds. Assume that if the process has not exited
--
Gitblit v1.10.0