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/server/org/opends/server/tools/CreateRCScript.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/CreateRCScript.java b/opends/src/server/org/opends/server/tools/CreateRCScript.java
index 3f7fe7a..a325462 100644
--- a/opends/src/server/org/opends/server/tools/CreateRCScript.java
+++ b/opends/src/server/org/opends/server/tools/CreateRCScript.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2010 ForgeRock AS
+ * Portions Copyright 2010-2011 ForgeRock AS
*/
package org.opends.server.tools;
@@ -219,7 +219,7 @@
}
else
{
- javaHomeDir = System.getenv(SetupUtils.OPENDS_JAVA_HOME);
+ javaHomeDir = System.getenv(SetupUtils.OPENDJ_JAVA_HOME);
}
@@ -277,16 +277,16 @@
if (javaHomeDir != null)
{
w.println("# Specify the path to the Java installation to use");
- w.println("OPENDS_JAVA_HOME=\"" + javaHomeDir + "\"");
- w.println("export OPENDS_JAVA_HOME");
+ w.println("OPENDJ_JAVA_HOME=\"" + javaHomeDir + "\"");
+ w.println("export OPENDJ_JAVA_HOME");
w.println();
}
if (javaArgs.isPresent())
{
w.println("# Specify arguments that should be provided to the JVM");
- w.println("OPENDS_JAVA_ARGS=\"" + javaArgs.getValue() + "\"");
- w.println("export OPENDS_JAVA_ARGS");
+ w.println("OPENDJ_JAVA_ARGS=\"" + javaArgs.getValue() + "\"");
+ w.println("export OPENDJ_JAVA_ARGS");
w.println();
}
--
Gitblit v1.10.0