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/BuildInformation.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/BuildInformation.java b/opends/src/quicksetup/org/opends/quicksetup/BuildInformation.java
index fe7867b..06539c0 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/BuildInformation.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/BuildInformation.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.quicksetup;
@@ -80,9 +81,9 @@
final boolean[] done = {false};
try {
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"));
// This is required in order the return code to be valid.
- env.put("OPENDS_EXIT_NO_BACKGROUND", "true");
+ env.put("OPENDJ_EXIT_NO_BACKGROUND", "true");
final Process process = pb.start();
is = process.getInputStream();
out = process.getOutputStream();
--
Gitblit v1.10.0