Merge remote-tracking branch 'origin/master' into feature/adminlte3-u…

…pgrade
Evolveum · Apr 29, 2022 · ccec5c8 · ccec5c8
2 parents 0c5a677 + 95aa4c6
commit ccec5c8
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 28 deletions.
diff --git a/dist/src/main/assembly/dist.xml b/dist/src/main/assembly/dist.xml
@@ -19,6 +19,11 @@
             <source>../INSTALL-dist</source>
             <destName>INSTALL</destName>
         </file>
+        <!-- We do this the old/simple way, because adding midpoint-jar dep breaks javadoc steps. -->
+        <file>
+            <source>../gui/midpoint-jar/target/midpoint.jar</source>
+            <destName>lib/midpoint.jar</destName>
+        </file>
     </files>
     <fileSets>
         <fileSet>

diff --git a/dist/src/main/bin/midpoint.bat b/dist/src/main/bin/midpoint.bat
@@ -54,8 +54,8 @@ if "%MIDPOINT_PORT%" NEQ "8080" (
 
 echo Using MIDPOINT_HOME:   "%MIDPOINT_HOME%"
 
-if not exist "%LIB_DIR%\midpoint.war" (
-    echo Error: The midpoint.war is not in the lib directory
+if not exist "%LIB_DIR%\midpoint.jar" (
+    echo Error: The midpoint.jar is not in the lib directory
     goto end
 )
 
@@ -79,7 +79,7 @@ echo.
 echo Starting midPoint.
 start /b "midPoint" "%RUN_JAVA%"^
  %JAVA_OPTS% -Dmidpoint.home="%MIDPOINT_HOME%"^
- -jar "%LIB_DIR%\midpoint.war" %2 %3 %4 %5 %6 %7 %8 %9 > "%BOOT_OUT%" 2>&1
+ -jar "%LIB_DIR%\midpoint.jar" %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
@@ -358,8 +358,8 @@ JAVA_OPTS="$(echo "${JAVA_OPTS:-}" | tr -s [[:space:]] " " | sed "s/^[[:space:]]
 : "${BOOT_OUT:="${MIDPOINT_HOME}/log/midpoint.out"}"
 : "${PID_FILE:="${MIDPOINT_HOME}/log/midpoint.pid"}"
 
-if [[ ! -f "${BASE_DIR}/lib/midpoint.war" ]]; then
-  echo "ERROR: midpoint.war is not in /lib directory"
+if [[ ! -f "${BASE_DIR}/lib/midpoint.jar" ]]; then
+  echo "ERROR: midpoint.jar is not in /lib directory"
   exit 1
 fi
 
@@ -403,7 +403,7 @@ Description=MidPoint Standalone Service
 [Service]
 User=${userToUse:-midpoint}
 WorkingDirectory=${BASE_DIR}
-ExecStart=\"${_RUNJAVA}\" ${JAVA_OPTS} -jar \"${BASE_DIR}/lib/midpoint.war\" \"$@\"
+ExecStart=\"${_RUNJAVA}\" ${JAVA_OPTS} -jar \"${BASE_DIR}/lib/midpoint.jar\" \"$@\"
 SuccessExitStatus=143
 ###TimeoutStopSec=120s
 
@@ -442,11 +442,11 @@ if [[ "$1" == "container" ]]; then
   if [ "${1:-}" = "" ] ; then
     eval "\"${_RUNJAVA}\"" \
       ${JAVA_OPTS} \
-      -jar "\"${BASE_DIR}/lib/midpoint.war\"" 2>&1
+      -jar "\"${BASE_DIR}/lib/midpoint.jar\"" 2>&1
   else
     eval "\"${_RUNJAVA}\"" \
       ${JAVA_OPTS} \
-      -jar "\"${BASE_DIR}/lib/midpoint.war\"" \
+      -jar "\"${BASE_DIR}/lib/midpoint.jar\"" \
       "$@" 2>&1
   fi
 
@@ -508,7 +508,7 @@ if [[ "$1" == "start" ]]; then
   # shellcheck disable=SC2086
   eval "${_NOHUP}" "\"${_RUNJAVA}\"" \
     ${JAVA_OPTS} \
-    -jar "\"${BASE_DIR}/lib/midpoint.war\"" \
+    -jar "\"${BASE_DIR}/lib/midpoint.jar\"" \
     "$@" \
     "&" >>"${BOOT_OUT}" 2>&1
 

diff --git a/dist/src/main/bin/service.bat b/dist/src/main/bin/service.bat
@@ -56,12 +56,12 @@ echo NB: JAVA_HOME should point to a JDK not a JRE
 goto end
 :okJavaHome
 
-REM MIDPOINT_WAR if not defined
-if exist "%cd%\lib\midpoint.war" goto gotWar
-echo The midpoint.war is not in \lib directory
+REM MIDPOINT_JAR if not defined
+if exist "%cd%\lib\midpoint.jar" goto gotJar
+echo The midpoint.jar is not in \lib directory
 echo Can not start midPoint
 goto end
-:gotWar
+:gotJar
 
 if "%MIDPOINT_HOME%" == "%MIDPOINT_HOME:;=%" goto homeNoSemicolon
 echo Using MIDPOINT_HOME: "%MIDPOINT_HOME%"
@@ -73,7 +73,7 @@ REM ----- Execute The Requested Command ---------------------------------------
 
 set EXECUTABLE=%BIN_DIR%\midpoint.exe
 set PR_INSTALL=%EXECUTABLE%
-set MIDPOINT_LAUNCHER_CLASS=com.evolveum.midpoint.launcher.MidPointWarLauncher
+set MIDPOINT_LAUNCHER_CLASS=com.evolveum.midpoint.launcher.MidPointLauncher
 
 REM Service log configuration
 set PR_LOGPREFIX=%SERVICE_NAME%
@@ -93,9 +93,9 @@ echo Warning: Neither 'server' nor 'client' jvm.dll was found at JRE_HOME.
 set PR_JVM=auto
 :foundJvm
 
-set PR_CLASSPATH=%cd%\lib\midpoint.war
+set PR_CLASSPATH=%cd%\lib\midpoint.jar
 
-REM Statup configuration
+REM Startup configuration
 set PR_STARTUP=auto
 set PR_STARTMODE=jvm
 set PR_STARTMETHOD=main
@@ -107,8 +107,8 @@ set PR_STOPMETHOD=stop
 set PR_STOPCLASS=%MIDPOINT_LAUNCHER_CLASS%
 
 REM JVM configuration
-set PR_JVMMS=1024
-set PR_JVMMX=1024
+set PR_JVMMS=2g
+set PR_JVMMX=4g
 
 if %1 == install goto doInstall
 if %1 == remove goto doRemove

diff --git a/dist/src/main/var/README.txt b/dist/src/main/var/README.txt
@@ -22,7 +22,7 @@ OPTIONAL/ADDITIONAL LIBS
 
 Place any additional libs/JARs (like JDBC drivers) into $MIDPOINT_HOME/lib.
 DO NOT place them into lib in the midPoint distribution root, in other words,
-do not put anything next to midpoint.war, that's the wrong place.
+do not put anything next to midpoint.jar, that's the wrong place.
 
 MORE INFORMATION
 

diff --git a/gui/pom.xml b/gui/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2010-2021 Evolveum and contributors
+  ~ Copyright (C) 2010-2022 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -28,9 +28,11 @@
 
     <profiles>
         <profile>
-            <id>mpjar</id>
+            <id>dist</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <modules>
-                <module>admin-gui</module>
                 <module>midpoint-jar</module>
             </modules>
         </profile>

diff --git a/pom.xml b/pom.xml
@@ -549,7 +549,7 @@
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
-                    <!-- use org.apache.commons:commons-collections4 instead -->
+                    <!-- Use org.apache.commons:commons-collections4 instead, not required by our usages of validator. -->
                     <exclusion>
                         <groupId>commons-collections</groupId>
                         <artifactId>commons-collections</artifactId>
@@ -570,13 +570,15 @@
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
-                    <!-- use org.apache.commons:commons-collections4 instead -->
-                    <exclusion>
-                        <groupId>commons-collections</groupId>
-                        <artifactId>commons-collections</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>
+            <!-- TODO: We want to get rid of this, which requires removal of beanutils as well. -->
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>3.2.2</version>
+                <scope>runtime</scope>
+            </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>