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/svr4/OpenDJ/_svc-opendj.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opends/src/svr4/OpenDJ/_svc-opendj.sh b/opends/src/svr4/OpenDJ/_svc-opendj.sh
index 8c48748..eed7272 100644
--- a/opends/src/svr4/OpenDJ/_svc-opendj.sh
+++ b/opends/src/svr4/OpenDJ/_svc-opendj.sh
@@ -34,8 +34,8 @@
 
 case "$1" in
 'start')
-    OPENDS_JAVA_HOME="${OPENDS_JAVA_HOME}" \
-    OPENDS_JAVA_ARGS="${OPENDS_JAVA_ARGS}" ${STARTDS}
+    OPENDJ_JAVA_HOME="${OPENDJ_JAVA_HOME}" \
+    OPENDJ_JAVA_ARGS="${OPENDJ_JAVA_ARGS}" ${STARTDS}
     RES=$?
     if ${TEST} ${RES} -ne 0
     then
@@ -50,7 +50,7 @@
     ;;
 
 'stop')
-    OPENDS_JAVA_HOME="${OPENDS_JAVA_HOME}" ${STOPDS}
+    OPENDJ_JAVA_HOME="${OPENDJ_JAVA_HOME}" ${STOPDS}
     if ${TEST} $? -ne 0
     then
         exit ${SMF_EXIT_ERR_FATAL}

--
Gitblit v1.10.0