XWIKI-10810: Use JAVA_HOME if the user has set it instead of searching in the registry

xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/src/main/resources/start_xwiki.bat

@@ -56,9 +56,13 @@ if not defined JETTY_STOP_PORT (
 echo Starting Jetty on port %JETTY_PORT%, please wait...
 
 REM Get javaw.exe from the latest properly installed JRE
-for /f tokens^=2^ delims^=^" %%i in ('reg query HKEY_CLASSES_ROOT\jarfile\shell\open\command /ve') do set JAVAW_PATH=%%i
-set JAVA_PATH=%JAVAW_PATH:\javaw.exe=%\java.exe
-if "%JAVA_PATH%"=="" set JAVA_PATH=java
+if not "%JAVA_HOME%" == "" (
+  set JAVA_PATH=%JAVA_HOME\bin:java.exe
+  ) else (
+    for /f tokens^=2^ delims^=^" %%i in ('reg query HKEY_CLASSES_ROOT\jarfile\shell\open\command /ve') do set JAVAW_PATH=%%i
+    set JAVA_PATH=%JAVAW_PATH:\javaw.exe=%\java.exe
+    if "%JAVA_PATH%"=="" set JAVA_PATH=java
+    )
 
 REM Location where XWiki stores generated data and where database files are.
 set XWIKI_DATA_DIR=${xwikiDataDir}

xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/src/main/resources/start_xwiki_debug.bat

@@ -64,9 +64,13 @@ if "%2"=="profiler" (
 )
 
 REM Get javaw.exe from the latest properly installed JRE
-for /f tokens^=2^ delims^=^" %%i in ('reg query HKEY_CLASSES_ROOT\jarfile\shell\open\command /ve') do set JAVAW_PATH=%%i
-set JAVA_PATH=%JAVAW_PATH:\javaw.exe=%\java.exe
-if "%JAVA_PATH%"=="" set JAVA_PATH=java
+if not "%JAVA_HOME%" == "" (
+  set JAVA_PATH=%JAVA_HOME\bin:java.exe
+  ) else (
+    for /f tokens^=2^ delims^=^" %%i in ('reg query HKEY_CLASSES_ROOT\jarfile\shell\open\command /ve') do set JAVAW_PATH=%%i
+    set JAVA_PATH=%JAVAW_PATH:\javaw.exe=%\java.exe
+    if "%JAVA_PATH%"=="" set JAVA_PATH=java
+    )
 
 REM Location where XWiki stores generated data and where database files are.
 set XWIKI_DATA_DIR=${xwikiDataDir}

xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/src/main/resources/stop_xwiki.bat

@@ -30,9 +30,13 @@ if not defined JETTY_STOP_PORT (
 )
 
 REM Get javaw.exe from the latest properly installed JRE
-for /f tokens^=2^ delims^=^" %%i in ('reg query HKEY_CLASSES_ROOT\jarfile\shell\open\command /ve') do set JAVAW_PATH=%%i
-set JAVA_PATH=%JAVAW_PATH:\javaw.exe=%\java.exe
-if "%JAVA_PATH%"=="" set JAVA_PATH=java
+if not "%JAVA_HOME%" == "" (
+  set JAVA_PATH=%JAVA_HOME\bin:java.exe
+  ) else (
+    for /f tokens^=2^ delims^=^" %%i in ('reg query HKEY_CLASSES_ROOT\jarfile\shell\open\command /ve') do set JAVAW_PATH=%%i
+    set JAVA_PATH=%JAVAW_PATH:\javaw.exe=%\java.exe
+    if "%JAVA_PATH%"=="" set JAVA_PATH=java
+    )
 
 REM Specify port and key to stop a running Jetty instance
 set XWIKI_OPTS=-DSTOP.KEY=xwiki -DSTOP.PORT=%JETTY_STOP_PORT%