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/_client-script.bat |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/opends/resource/bin/_client-script.bat b/opends/resource/bin/_client-script.bat
index 1babe1b..9d1e724 100644
--- a/opends/resource/bin/_client-script.bat
+++ b/opends/resource/bin/_client-script.bat
@@ -24,6 +24,7 @@
 rem
 rem
 rem      Copyright 2006-2010 Sun Microsystems, Inc.
+rem      Portions Copyright 2011 ForgeRock AS
 
 rem This script is used to invoke various client-side processes.  It should not
 rem be invoked directly by end users.
@@ -42,11 +43,11 @@
 set INSTANCE_ROOT=%CD%
 cd /d %CUR_DIR%
 
-if "%OPENDS_INVOKE_CLASS%" == "" goto noInvokeClass
+if "%OPENDJ_INVOKE_CLASS%" == "" goto noInvokeClass
 goto launchCommand
 
 :noInvokeClass
-echo Error:  OPENDS_INVOKE_CLASS environment variable is not set.
+echo Error:  OPENDJ_INVOKE_CLASS environment variable is not set.
 pause
 goto end
 
@@ -55,7 +56,7 @@
 call "%INSTALL_ROOT%\lib\_script-util.bat" %*
 if NOT %errorlevel% == 0 exit /B %errorlevel%
 
-"%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% %*
 
 :end
 

--
Gitblit v1.10.0