Fix for OPENDJ-222 : Renamed environment variables to OPENDJ_... Updated sc...

Ludovic Poitou

02.07.2011 3dfb061cbafd3a97c9359f739942924a8ee525f1

 opends/resource/bin/control-panel.bat

@@ -24,6 +24,7 @@
rem
rem
rem      Copyright 2006-2009 Sun Microsystems, Inc.
rem      Portions Copyright 2011 ForgeRock AS

setlocal
for %%i in (%~sf0) do set DIR_HOME=%%~dPsi..
@@ -52,12 +53,12 @@

:callLaunch
if exist "%INSTALL_ROOT%\lib\set-java-args.bat" DO call "%INSTALL_ROOT%\lib\set-java-args.bat"
"%INSTALL_ROOT%\lib\winlauncher.exe" launch "%OPENDS_JAVA_BIN%" %OPENDS_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.guitools.controlpanel.ControlPanelLauncher
"%INSTALL_ROOT%\lib\winlauncher.exe" launch "%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.guitools.controlpanel.ControlPanelLauncher
goto end

:callJava
if exist "%INSTALL_ROOT%\lib\set-java-args.bat" DO call "%INSTALL_ROOT%\lib\set-java-args.bat"
"%OPENDS_JAVA_BIN%" %OPENDS_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.guitools.controlpanel.ControlPanelLauncher %*
"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.guitools.controlpanel.ControlPanelLauncher %*

rem return part
if %errorlevel% == 50 goto version