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/unconfigure | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opends/resource/unconfigure b/opends/resource/unconfigure
index c50d875..265f159 100755
--- a/opends/resource/unconfigure
+++ b/opends/resource/unconfigure
@@ -65,7 +65,7 @@
# An exit code of 0 means options are correct => continue unconfiguration
# An exit code of 51 means --help or --version option has been specified => do not unconfigure
# An exit code of 10 means syntax error => do not unconfigure
-"${OPENDS_JAVA_BIN}" ${OPENDS_JAVA_ARGS} ${SCRIPT_NAME_ARG} -DINSTALL_ROOT=${INSTALL_ROOT} org.opends.server.tools.configurator.Unconfigurator --checkOptions "${@}"
+"${OPENDJ_JAVA_BIN}" ${OPENDJ_JAVA_ARGS} ${SCRIPT_NAME_ARG} -DINSTALL_ROOT=${INSTALL_ROOT} org.opends.server.tools.configurator.Unconfigurator --checkOptions "${@}"
EC=${?}
if test ${EC} -eq 10
then
@@ -79,7 +79,7 @@
# Launch the unconfiguration
# Stop the server if needed
# Check server status: an exit code of 98 means that the server is running
-${OPENDS_JAVA_BIN} ${SCRIPT_NAME_ARG} org.opends.server.core.DirectoryServer \
+${OPENDJ_JAVA_BIN} ${SCRIPT_NAME_ARG} org.opends.server.core.DirectoryServer \
--configClass org.opends.server.extensions.ConfigFileHandler \
--configFile "${CONFIG_FILE}" --checkStartability "${@}" > /dev/null 2>&1
EC=${?}
@@ -93,11 +93,11 @@
EC=98
while test ${EC} -eq 98
do
- ${OPENDS_JAVA_BIN} ${SCRIPT_NAME_ARG} org.opends.server.core.DirectoryServer \
+ ${OPENDJ_JAVA_BIN} ${SCRIPT_NAME_ARG} org.opends.server.core.DirectoryServer \
--configClass org.opends.server.extensions.ConfigFileHandler \
--configFile "${CONFIG_FILE}" --checkStartability "${@}" > /dev/null 2>&1
EC=${?}
- sleep 1
+ sleep 1
done
else
echo "Unable to stop the server: ${EC}"
@@ -115,7 +115,7 @@
echo "Resetting instance location ..."
# Launch the unconfigure process.
-"${OPENDS_JAVA_BIN}" ${OPENDS_JAVA_ARGS} ${SCRIPT_NAME_ARG} -DINSTALL_ROOT=${INSTALL_ROOT} org.opends.server.tools.configurator.Unconfigurator "${@}"
+"${OPENDJ_JAVA_BIN}" ${OPENDJ_JAVA_ARGS} ${SCRIPT_NAME_ARG} -DINSTALL_ROOT=${INSTALL_ROOT} org.opends.server.tools.configurator.Unconfigurator "${@}"
EC=${?}
if test ${EC} -eq 10
then
--
Gitblit v1.10.0