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/InstallerHelper.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
index d02bc56..3e627d5 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
@@ -160,8 +160,8 @@
LOG.log(Level.INFO, "import-ldif arg list: "+argList);
ProcessBuilder pb = new ProcessBuilder(allArgs);
Map<String, String> env = pb.environment();
- env.remove(SetupUtils.OPENDS_JAVA_HOME);
- env.remove(SetupUtils.OPENDS_JAVA_ARGS);
+ env.remove(SetupUtils.OPENDJ_JAVA_HOME);
+ env.remove(SetupUtils.OPENDJ_JAVA_ARGS);
env.remove("CLASSPATH");
pb.directory(installPath);
Process process = null;
@@ -908,7 +908,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);
}
// Try to transform things if necessary. The following map has as key
--
Gitblit v1.10.0