Merge remote-tracking branch 'origin/master' into feature/gui-remove-…

…old-forms

* origin/master:
  MID-7778:fix for error message during reconcile of focus objects
  midpoint-boot-layout: update/modernization, and JAR support
  MidPointSpringApplication: fatal exception is now reported to stderr
  App classes (main+test): cleanup, removed c.e.m.web.security.factory
  MID-7860 fix: iterative search with order by polystring is correct now
  Native test701SearchUsersHavingShadowMatchingMultipleCriteria works!
  .editorconfig: refresh + ij_java_align_types_in_multi_catch = false
  MID-7890: schema cleanup (self-registration, password reset)
  GUI Spring XML cleanup, mainly unused NS in empty overlay

.editorconfig

@@ -70,6 +70,7 @@ ij_java_align_multiline_text_blocks = false
 ij_java_align_multiline_throws_list = false
 ij_java_align_subsequent_simple_methods = false
 ij_java_align_throws_keyword = false
+ij_java_align_types_in_multi_catch = false
 ij_java_annotation_parameter_wrap = off
 ij_java_array_initializer_new_line_after_left_brace = false
 ij_java_array_initializer_right_brace_on_new_line = false
@@ -108,6 +109,7 @@ ij_java_class_count_to_use_import_on_demand = 5
 ij_java_class_names_in_javadoc = 1
 ij_java_do_not_indent_top_level_class_members = false
 ij_java_do_not_wrap_after_single_annotation = false
+ij_java_do_not_wrap_after_single_annotation_in_parameter = false
 ij_java_do_while_brace_force = if_multiline
 ij_java_doc_add_blank_line_after_description = true
 ij_java_doc_add_blank_line_after_param_comments = false
@@ -171,6 +173,7 @@ ij_java_label_indent_size = 0
 ij_java_lambda_brace_style = end_of_line
 ij_java_layout_static_imports_separately = true
 ij_java_line_comment_add_space = false
+ij_java_line_comment_add_space_on_reformat = false
 ij_java_line_comment_at_first_column = true
 ij_java_message_dd_suffix = EJB
 ij_java_message_eb_suffix = Bean
@@ -181,7 +184,9 @@ ij_java_method_parameters_new_line_after_left_paren = false
 ij_java_method_parameters_right_paren_on_new_line = false
 ij_java_method_parameters_wrap = off
 ij_java_modifier_list_wrap = false
+ij_java_multi_catch_types_wrap = normal
 ij_java_names_count_to_use_import_on_demand = 3
+ij_java_new_line_after_lparen_in_annotation = false
 ij_java_new_line_after_lparen_in_record_header = false
 ij_java_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
 ij_java_parameter_annotation_wrap = off
@@ -198,6 +203,7 @@ ij_java_replace_sum_lambda_with_method_ref = true
 ij_java_resource_list_new_line_after_left_paren = false
 ij_java_resource_list_right_paren_on_new_line = false
 ij_java_resource_list_wrap = off
+ij_java_rparen_on_new_line_in_annotation = false
 ij_java_rparen_on_new_line_in_record_header = false
 ij_java_session_dd_suffix = EJB
 ij_java_session_eb_suffix = Bean
@@ -253,6 +259,7 @@ ij_java_space_within_empty_array_initializer_braces = false
 ij_java_space_within_empty_method_call_parentheses = false
 ij_java_space_within_empty_method_parentheses = false
 ij_java_spaces_around_additive_operators = true
+ij_java_spaces_around_annotation_eq = true
 ij_java_spaces_around_assignment_operators = true
 ij_java_spaces_around_bitwise_operators = true
 ij_java_spaces_around_equality_operators = true
@@ -844,6 +851,7 @@ ij_groovy_class_brace_style = end_of_line
 ij_groovy_class_count_to_use_import_on_demand = 5
 ij_groovy_do_while_brace_force = never
 ij_groovy_else_on_new_line = false
+ij_groovy_enable_groovydoc_formatting = true
 ij_groovy_enum_constants_wrap = off
 ij_groovy_extends_keyword_wrap = off
 ij_groovy_extends_list_wrap = off
@@ -876,6 +884,7 @@ ij_groovy_label_indent_size = 0
 ij_groovy_lambda_brace_style = end_of_line
 ij_groovy_layout_static_imports_separately = true
 ij_groovy_line_comment_add_space = false
+ij_groovy_line_comment_add_space_on_reformat = false
 ij_groovy_line_comment_at_first_column = true
 ij_groovy_method_annotation_wrap = split_into_lines
 ij_groovy_method_brace_style = end_of_line
@@ -1026,6 +1035,7 @@ ij_kotlin_keep_indents_on_empty_lines = false
 ij_kotlin_keep_line_breaks = true
 ij_kotlin_lbrace_on_next_line = false
 ij_kotlin_line_comment_add_space = false
+ij_kotlin_line_comment_add_space_on_reformat = false
 ij_kotlin_line_comment_at_first_column = true
 ij_kotlin_method_annotation_wrap = split_into_lines
 ij_kotlin_method_call_chain_wrap = off
@@ -1122,13 +1132,17 @@ ij_markdown_force_one_space_after_blockquote_symbol = true
 ij_markdown_force_one_space_after_header_symbol = true
 ij_markdown_force_one_space_after_list_bullet = true
 ij_markdown_force_one_space_between_words = true
+ij_markdown_insert_quote_arrows_on_wrap = true
 ij_markdown_keep_indents_on_empty_lines = false
+ij_markdown_keep_line_breaks_inside_text_blocks = true
 ij_markdown_max_lines_around_block_elements = 1
 ij_markdown_max_lines_around_header = 1
 ij_markdown_max_lines_between_paragraphs = 1
 ij_markdown_min_lines_around_block_elements = 1
 ij_markdown_min_lines_around_header = 1
 ij_markdown_min_lines_between_paragraphs = 1
+ij_markdown_wrap_text_if_long = false
+ij_markdown_wrap_text_inside_blockquotes = true
 
 [{*.pb,*.textproto}]
 indent_size = 2
@@ -1152,6 +1166,10 @@ ij_properties_keep_blank_lines = false
 ij_properties_key_value_delimiter = equals
 ij_properties_spaces_around_key_value_delimiter = false
 
+[{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}]
+ij_visual_guides = none
+ij_toml_keep_indents_on_empty_lines = false
+
 [{*.yaml,*.yml}]
 indent_size = 2
 ij_visual_guides = none

dist/src/main/bin/service.bat

@@ -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.tools.layout.MidPointWarLauncher
+set MIDPOINT_LAUNCHER_CLASS=com.evolveum.midpoint.launcher.MidPointWarLauncher
 
 REM Service log configuration
 set PR_LOGPREFIX=%SERVICE_NAME%

gui/admin-gui/pom.xml

@@ -596,10 +596,6 @@
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>jakarta.mail</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.codehaus.janino</groupId>
             <artifactId>janino</artifactId>
@@ -865,7 +861,7 @@
                         <phase>package</phase>
                         <configuration>
                             <classifier>executable</classifier>
-                            <layoutFactory implementation="com.evolveum.midpoint.tools.layout.MidPointWarLayoutFactory"/>
+                            <layoutFactory implementation="com.evolveum.midpoint.launcher.MidPointWarLayoutFactory"/>
                         </configuration>
                     </execution>
                 </executions>

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiConstants.java

@@ -12,7 +12,4 @@ public class GuiConstants {
 
     public static final String NS_UI_PREFIX = SchemaConstants.NS_MIDPOINT_PUBLIC_PREFIX + "ui/";
     public static final String NS_UI_FEATURE = NS_UI_PREFIX + "feature";
-
-    public static final String DEFAULT_PATH_AFTER_LOGIN = "/self/dashboard";
-    public static final String DEFAULT_PATH_AFTER_LOGOUT = "/";
 }

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java

@@ -1,17 +1,15 @@
 /*
- * 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.
  */
 package com.evolveum.midpoint.web.boot;
 
-import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
-import com.evolveum.midpoint.gui.impl.factory.panel.TextAreaPanelFactory;
-import com.evolveum.midpoint.gui.impl.registry.GuiComponentRegistryImpl;
-import com.evolveum.midpoint.task.api.TaskManager;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
+import java.lang.management.ManagementFactory;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Collections;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.Manager;
@@ -44,10 +42,13 @@
 import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
 import org.springframework.stereotype.Component;
 
-import java.lang.management.ManagementFactory;
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.Collections;
+import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
+import com.evolveum.midpoint.gui.impl.factory.panel.TextAreaPanelFactory;
+import com.evolveum.midpoint.gui.impl.registry.GuiComponentRegistryImpl;
+import com.evolveum.midpoint.schema.util.ExceptionUtil;
+import com.evolveum.midpoint.task.api.TaskManager;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
 
 /**
  * Created by Viliam Repan (lazyman).
@@ -83,7 +84,6 @@
 @SpringBootConfiguration
 @ComponentScan(
         basePackages = {
-                "com.evolveum.midpoint.web.security.factory",
                 "com.evolveum.midpoint.gui",
                 "com.evolveum.midpoint.gui.api",
         },
@@ -114,7 +114,12 @@ public static void main(String[] args) {
             System.exit(SpringApplication.exit(applicationContext, () -> 0));
 
         } else {
-            applicationContext = configureApplication(new SpringApplicationBuilder()).run(args);
+            try {
+                applicationContext = configureApplication(new SpringApplicationBuilder()).run(args);
+            } catch (Throwable e) {
+                reportFatalErrorToStdErr(e);
+                throw e;
+            }
 
             if (LOGGER.isDebugEnabled()) {
                 LOGGER.debug("PID:" + ManagementFactory.getRuntimeMXBean().getName() +
@@ -123,6 +128,19 @@ public static void main(String[] args) {
         }
     }
 
+    private static final int MAX_FATAL_ERROR_OUTPUT_LENGTH = 300;
+
+    private static void reportFatalErrorToStdErr(Throwable e) {
+        System.err.println("ERROR initializing midPoint: "
+                + StringUtils.abbreviate(e.toString(), MAX_FATAL_ERROR_OUTPUT_LENGTH));
+        Throwable rootCause = ExceptionUtil.findRootCause(e);
+        if (rootCause != null && rootCause != e) {
+            System.err.println("ROOT cause: "
+                    + StringUtils.abbreviate(rootCause.toString(), MAX_FATAL_ERROR_OUTPUT_LENGTH));
+        }
+        System.err.println("See midpoint.log for more details.");
+    }
+
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
         return configureApplication(application);
@@ -148,8 +166,8 @@ private static SpringApplicationBuilder configureApplication(SpringApplicationBu
 
         application.bannerMode(Banner.Mode.LOG);
 
-        // cglib used by wicket unsupport java 15+ so we need use byte buddy generation for wicket
-        // We can remove this after cglib(wicket) fix issue with java 15+ or when wicket will use byte buddy as default
+        // cglib used by wicket does not support Java 15+ so we need use byte buddy generation for wicket.
+        // We can remove this after cglib(wicket) fix issue with java 15+ or when wicket will use byte buddy as default.
         System.setProperty("wicket.ioc.useByteBuddy", "true");
 
         return application.sources(MidPointSpringApplication.class);

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java

@@ -273,19 +273,20 @@ private void reconcilePerformed(AjaxRequestTarget target, IModel<SelectableBean<
         OperationResult result = new OperationResult(getOperationName(OPERATION_RECONCILE_OBJECTS));
         for (SelectableBean<F> object : objects) {
             OperationResult opResult = result.createSubresult(getOperationName(OPERATION_RECONCILE_OBJECT));
+            F focus = object.getValue();
             try {
                 Task task = parentPage.createSimpleTask(OPERATION_RECONCILE_OBJECT);
                 ObjectDelta delta = parentPage.getPrismContext().deltaFactory().object()
-                        .createEmptyModifyDelta(objectClass, object.getValue().getOid()
+                        .createEmptyModifyDelta(objectClass, focus.getOid()
                         );
                 Collection<ObjectDelta<? extends ObjectType>> deltas = MiscUtil.createCollection(delta);
                 parentPage.getModelService().executeChanges(deltas, parentPage.executeOptions().reconcile(), task, opResult);
                 opResult.computeStatusIfUnknown();
             } catch (CommonException|RuntimeException ex) {
                 opResult.recomputeStatus();
                 opResult.recordFatalError(
-                        parentPage.createStringResource("FocusListInlineMenuHelper.message.reconcile.fatalError", object).getString(), ex);
-                LoggingUtils.logUnexpectedException(LOGGER, "Couldn't reconcile object " + object + ".", ex);
+                        parentPage.createStringResource("FocusListInlineMenuHelper.message.reconcile.fatalError", focus).getString(), ex);
+                LoggingUtils.logUnexpectedException(LOGGER, "Couldn't reconcile object " + focus + ".", ex);
             }
         }