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/util/ServerController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java b/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
index 57feb1b..9c81c8b 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.quicksetup.util;
@@ -164,8 +165,8 @@
}
ProcessBuilder pb = new ProcessBuilder(args);
Map<String, String> env = pb.environment();
- env.put(SetupUtils.OPENDS_JAVA_HOME, System.getProperty("java.home"));
- env.remove(SetupUtils.OPENDS_JAVA_ARGS);
+ env.put(SetupUtils.OPENDJ_JAVA_HOME, System.getProperty("java.home"));
+ env.remove(SetupUtils.OPENDJ_JAVA_ARGS);
env.remove("CLASSPATH");
LOG.log(Level.INFO, "Before calling stop-ds. Is server running? "+
@@ -361,8 +362,8 @@
ProcessBuilder pb = new ProcessBuilder(args);
pb.directory(installation.getBinariesDirectory());
Map<String, String> env = pb.environment();
- env.put(SetupUtils.OPENDS_JAVA_HOME, System.getProperty("java.home"));
- env.remove(SetupUtils.OPENDS_JAVA_ARGS);
+ env.put(SetupUtils.OPENDJ_JAVA_HOME, System.getProperty("java.home"));
+ env.remove(SetupUtils.OPENDJ_JAVA_ARGS);
// Upgrader's classpath contains jars located in the temporary
// directory that we don't want locked by the directory server
--
Gitblit v1.10.0