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/guitools/org/opends/guitools/controlpanel/task/Task.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java b/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java
index ebf75e6..d206511 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.guitools.controlpanel.task;
@@ -562,8 +563,8 @@
ProcessBuilder pb = new ProcessBuilder(cmd);
// Use the java args in the script.
Map<String, String> env = pb.environment();
- //env.put(SetupUtils.OPENDS_JAVA_ARGS, "");
- env.remove(SetupUtils.OPENDS_JAVA_ARGS);
+ //env.put(SetupUtils.OPENDJ_JAVA_ARGS, "");
+ env.remove(SetupUtils.OPENDJ_JAVA_ARGS);
env.remove("CLASSPATH");
ProcessReader outReader = null;
ProcessReader errReader = null;
--
Gitblit v1.10.0