midpoint.bat aligned with midpoint.sh + -Dmidpoint.home out of JAVA_OPTS

Evolveum · Sep 10, 2020 · 79da481 · 79da481
1 parent daa39f3
commit 79da481
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/dist/src/main/bin/midpoint.bat b/dist/src/main/bin/midpoint.bat
@@ -9,6 +9,7 @@ echo Error: No command given. Specify either start or stop.
 goto end
 
 :doStart
+REM BIN_DIR will end with \
 set BIN_DIR=%~dp0
 set LIB_DIR=%BIN_DIR%..\lib
 
@@ -24,6 +25,7 @@ if not exist "%BIN_DIR%midpoint.bat" (
     goto end
 )
 
+set ORIG_JAVA_OPTS=%JAVA_OPTS%
 set JAVA_OPTS=-Xms2048M -Xmx4096M -Dpython.cachedir="%MIDPOINT_HOME%\tmp" -Djavax.net.ssl.trustStore="%MIDPOINT_HOME%\keystore.jceks" -Djavax.net.ssl.trustStoreType=jceks %JAVA_OPTS%
 
 if not exist "%BIN_DIR%setenv.bat" goto :noSetEnv
@@ -33,6 +35,15 @@ echo.
 call "%BIN_DIR%setenv.bat"
 
 :noSetEnv
+
+if not exist "%MIDPOINT_HOME%\setenv.bat" goto :noSetEnvMpHome
+echo Applying %MIDPOINT_HOME%\setenv.bat
+echo.
+
+call "%MIDPOINT_HOME%\setenv.bat"
+
+:noSetEnvMpHome
+
 echo Using MIDPOINT_HOME:   "%MIDPOINT_HOME%"
 
 if not exist "%LIB_DIR%\midpoint.war" (
@@ -58,7 +69,11 @@ echo Using JAVA_OPTS:       "%JAVA_OPTS%"
 echo Using parameters:      "%*"
 echo.
 echo Starting midPoint.
-start /b "midPoint" "%RUN_JAVA%" -jar %JAVA_OPTS% -Dmidpoint.home="%MIDPOINT_HOME%" "%LIB_DIR%\midpoint.war" %2 %3 %4 %5 %6 %7 %8 %9 > "%BOOT_OUT%" 2>&1
+start /b "midPoint" "%RUN_JAVA%"^
+ %JAVA_OPTS% -Dmidpoint.home="%MIDPOINT_HOME%"^
+ -cp "%LIB_DIR%\midpoint.war"^
+ -Dloader.path=WEB-INF/classes,WEB-INF/lib,WEB-INF/lib-provided,%MIDPOINT_HOME%\lib^
+ org.springframework.boot.loader.PropertiesLauncher %2 %3 %4 %5 %6 %7 %8 %9 > "%BOOT_OUT%" 2>&1
 goto end
 
 :doStop

diff --git a/dist/src/main/bin/midpoint.sh b/dist/src/main/bin/midpoint.sh
@@ -27,8 +27,7 @@ JAVA_OPTS="${JAVA_OPTS:-}
 -Xmx4096M
 -Dpython.cachedir=${MIDPOINT_HOME}/tmp
 -Djavax.net.ssl.trustStore=${MIDPOINT_HOME}/keystore.jceks
--Djavax.net.ssl.trustStoreType=jceks
--Dmidpoint.home=${MIDPOINT_HOME}"
+-Djavax.net.ssl.trustStoreType=jceks"
 
 # Apply bin/setenv.sh if it exists. This setenv.sh does not depend on MIDPOINT_HOME.
 # The script can either append or overwrite JAVA_OPTS, e.g. to set -Dmidpoint.nodeId.
@@ -54,6 +53,7 @@ if [[ ! -f "${BASE_DIR}/lib/midpoint.war" ]]; then
   exit 1
 fi
 
+# TODO probably useless from Tomcat 7 and before history, remove and check LDAP/ConnId logging
 : "${LOGGING_MANAGER:="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"}"
 
 # Set UMASK unless it has been overridden
@@ -128,7 +128,7 @@ if [[ "$1" == "start" ]]; then
 
   # shellcheck disable=SC2086
   eval "${_NOHUP}" "\"${_RUNJAVA}\"" \
-    ${LOGGING_MANAGER} ${JAVA_OPTS} \
+    ${LOGGING_MANAGER} ${JAVA_OPTS} -Dmidpoint.home=${MIDPOINT_HOME}\
     -cp "${BASE_DIR}/lib/midpoint.war" \
     -Dloader.path=WEB-INF/classes,WEB-INF/lib,WEB-INF/lib-provided,${MIDPOINT_HOME}/lib/ \
     org.springframework.boot.loader.PropertiesLauncher \