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/resource/bin/_server-script.sh | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opends/resource/bin/_server-script.sh b/opends/resource/bin/_server-script.sh
index afb06da..8cc1d8d 100755
--- a/opends/resource/bin/_server-script.sh
+++ b/opends/resource/bin/_server-script.sh
@@ -24,13 +24,14 @@
#
#
# Copyright 2006-2010 Sun Microsystems, Inc.
+# Portions Copyright 2011 ForgeRock AS
# This script is used to invoke various server-side processes. It should not
# be invoked directly by end users.
-if test -z "${OPENDS_INVOKE_CLASS}"
+if test -z "${OPENDJ_INVOKE_CLASS}"
then
- echo "ERROR: OPENDS_INVOKE_CLASS environment variable is not set."
+ echo "ERROR: OPENDJ_INVOKE_CLASS environment variable is not set."
exit 1
fi
@@ -60,6 +61,6 @@
fi
# Launch the appropriate server utility.
-"${OPENDS_JAVA_BIN}" ${OPENDS_JAVA_ARGS} ${SCRIPT_ARGS} ${SCRIPT_NAME_ARG} "${OPENDS_INVOKE_CLASS}" \
+"${OPENDJ_JAVA_BIN}" ${OPENDJ_JAVA_ARGS} ${SCRIPT_ARGS} ${SCRIPT_NAME_ARG} "${OPENDJ_INVOKE_CLASS}" \
--configClass org.opends.server.extensions.ConfigFileHandler \
--configFile "${INSTANCE_ROOT}/config/config.ldif" "${@}"
--
Gitblit v1.10.0