Merge branch 'master' into feature/new-ws

# Conflicts:
#	gui/admin-gui/pom.xml

.editorconfig

@@ -1,6 +1,6 @@
 [*]
 charset = utf-8
-end_of_line = crlf
+end_of_line = lf
 indent_size = 4
 indent_style = space
 insert_final_newline = false
@@ -10,7 +10,7 @@ trim_trailing_whitespace = true
 ij_continuation_indent_size = 8
 ij_formatter_off_tag = @formatter:off
 ij_formatter_on_tag = @formatter:on
-ij_formatter_tags_enabled = false
+ij_formatter_tags_enabled = true
 ij_smart_tabs = false
 ij_visual_guides = 100,130,150,180
 ij_wrap_on_typing = false
@@ -108,8 +108,8 @@ ij_java_doc_add_blank_line_after_description = true
 ij_java_doc_add_blank_line_after_param_comments = false
 ij_java_doc_add_blank_line_after_return = false
 ij_java_doc_add_p_tag_on_empty_lines = true
-ij_java_doc_align_exception_comments = true
-ij_java_doc_align_param_comments = true
+ij_java_doc_align_exception_comments = false
+ij_java_doc_align_param_comments = false
 ij_java_doc_do_not_wrap_if_one_line = false
 ij_java_doc_enable_formatting = true
 ij_java_doc_enable_leading_asterisks = true
@@ -156,7 +156,7 @@ ij_java_keep_first_column_comment = true
 ij_java_keep_indents_on_empty_lines = false
 ij_java_keep_line_breaks = true
 ij_java_keep_multiple_expressions_in_one_line = false
-ij_java_keep_simple_blocks_in_one_line = false
+ij_java_keep_simple_blocks_in_one_line = true
 ij_java_keep_simple_classes_in_one_line = false
 ij_java_keep_simple_lambdas_in_one_line = false
 ij_java_keep_simple_methods_in_one_line = false

build-tools/src/main/resources/midpoint-build/checkstyle-suppressions.xml → config/checkstyle/checkstyle-suppressions.xml

@@ -8,16 +8,20 @@
     <suppress files="[/\\]annotation_3[/\\]" checks="ConstantName"/>
     <suppress files="[/\\]query_3[/\\]" checks="ConstantName|AvoidNestedBlocks|NeedBraces"/>
     <suppress files="[/\\]types_3[/\\]" checks="ConstantName|AvoidNestedBlocks|NeedBraces"/>
-    <suppress files="[/\\]public[/\\]query-3.xsd$" checks="NewlineAtEndOfFile"/>
-    <suppress files="[/\\]public[/\\]types-3.xsd$" checks="NewlineAtEndOfFile"/>
-    <suppress files="[/\\]public[/\\]annotation-3.xsd$" checks="NewlineAtEndOfFile"/>
-    <suppress files="[/\\]test[/\\]foo.*-1.xsd$" checks="NewlineAtEndOfFile"/>
+    <suppress files="[/\\]public[/\\]query-3\.xsd$" checks="NewlineAtEndOfFile"/>
+    <suppress files="[/\\]public[/\\]types-3\.xsd$" checks="NewlineAtEndOfFile"/>
+    <suppress files="[/\\]public[/\\]annotation-3\.xsd$" checks="NewlineAtEndOfFile"/>
+    <suppress files="[/\\]test[/\\]foo.*-1\.xsd$" checks="NewlineAtEndOfFile"/>
     <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]prism[/\\]delta[/\\]builder[/\\]" checks="TypeName"/>
     <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]prism[/\\]query[/\\]builder[/\\]" checks="TypeName"/>
     <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]prism[/\\]impl[/\\]query[/\\]builder[/\\]" checks="TypeName"/>
-    <suppress files="[/\\]resources[/\\]localization[/\\]Midpoint.*.properties" checks="NewlineAtEndOfFile"/>
+    <suppress files="[/\\]resources[/\\]localization[/\\]Midpoint.*\.properties" checks="NewlineAtEndOfFile"/>
+
+    <!-- TODO: added for tests in 2020, but I hope at least AvoidNestedBlocks could go away (Virgo) -->
+    <!-- For tests we use a lot of _ in various names and for good reason, so we want to ignore Name rules -->
+    <suppress files="[/\\]src[/\\]test[/\\]" checks="MethodName|ConstantName|LocalVariableName|AvoidNestedBlocks"/>
 
     <!-- This will be gone anyway. Sooner or later. -->
-    <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]model[/\\]api[/\\]ModelPort.java$" checks="InterfaceIsType"/>
-    <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]report[/\\]api[/\\]ReportPort.java$" checks="InterfaceIsType"/>
+    <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]model[/\\]api[/\\]ModelPort\.java$" checks="InterfaceIsType"/>
+    <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]report[/\\]api[/\\]ReportPort\.java$" checks="InterfaceIsType"/>
 </suppressions>

build-tools/src/main/resources/midpoint-build/checkstyle.xml → config/checkstyle/checkstyle.xml

@@ -33,11 +33,7 @@
     <module name="TreeWalker">
 
         <module name="ConstantName"/>
-        <module name="LocalFinalVariableName">
-            <!-- mostly due to TEST_NAME used a lot in the tests -->
-            <!-- Maybe we need to change that to lowercase convention later -->
-            <property name="format" value="^[a-zA-Z0-9_]+$"/>
-        </module>
+        <module name="LocalFinalVariableName"/>
         <module name="LocalVariableName"/>
         <module name="MemberName"/>
         <module name="MethodName"/>

dist/pom.xml

@@ -51,7 +51,6 @@
         <dependency>
             <groupId>com.evolveum.midpoint.tools</groupId>
             <artifactId>test-ng</artifactId>
-            <version>4.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

dist/src/main/bin/ninja.sh

@@ -70,6 +70,6 @@ if [ ! -z "$JDBC_DRIVER" ] ; then
    JDBC_DRIVER="-Dloader.path=$JDBC_DRIVER"
 fi
 
-exec "$_RUNJAVA" $JDBC_DRIVER -jar $SCRIPT_PATH../lib/ninja.jar -m $MIDPOINT_HOME $@
+exec "$_RUNJAVA" $JDBC_DRIVER -jar $SCRIPT_PATH../lib/ninja.jar -m $MIDPOINT_HOME "$@"
 
 

gui/admin-gui/pom.xml

@@ -56,10 +56,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -151,10 +147,6 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-cas</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jasig.cas.client</groupId>
-            <artifactId>cas-client-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>webjars-locator-core</artifactId>
@@ -481,13 +473,7 @@
         <dependency>
             <groupId>com.evolveum.midpoint.infra</groupId>
             <artifactId>common</artifactId>
-            <version>4.1-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- SPRING -->
@@ -511,6 +497,25 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
+        <dependency> <!-- needed as runtime dependency otherwise spring won't start -->
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- SPRING LDAP -->
+        <dependency>
+            <groupId>org.springframework.ldap</groupId>
+            <artifactId>spring-ldap-core</artifactId>
+        </dependency>
 
         <!-- SPRING SECURITY -->
         <dependency>
@@ -530,7 +535,7 @@
             <artifactId>spring-security-ldap</artifactId>
         </dependency>
 
-        <!--  WICKET DEPENDENCIES -->
+        <!-- WICKET DEPENDENCIES -->
         <dependency>
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-core</artifactId>
@@ -689,11 +694,15 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>com.evolveum.midpoint.infra</groupId>
             <artifactId>test-util</artifactId>
-            <version>4.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -711,7 +720,6 @@
         <dependency>
             <groupId>com.evolveum.midpoint.tools</groupId>
             <artifactId>test-ng</artifactId>
-            <version>4.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -818,6 +826,11 @@
             <version>4.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -837,7 +850,7 @@
                     <include>banner.txt</include>
                 </includes>
             </resource>
-            <!--  ICF LOGGING CONFIGURATION -->
+            <!-- ICF LOGGING CONFIGURATION -->
             <resource>
                 <targetPath>../midpoint/META-INF/services</targetPath>
                 <filtering>false</filtering>

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

@@ -45,6 +45,9 @@ public class ComponentConstants {
     public static final QName UI_CASE_TAB_APPROVAL = new QName(NS_COMPONENTS_PREFIX, "caseTabApproval");
     public static final String UI_CASE_TAB_APPROVAL_URL = QNameUtil.qNameToUri(UI_CASE_TAB_WORKITEMS);
 
+    public static final QName UI_CASE_TAB_MANUAL_OPERATION_DETAILS = new QName(NS_COMPONENTS_PREFIX, "caseTabManualOperationDetails");
+    public static final String UI_CASE_TAB_MANUAL_OPERATION_DETAILS_URL = QNameUtil.qNameToUri(UI_CASE_TAB_MANUAL_OPERATION_DETAILS);
+
     public static final QName UI_CASE_TAB_EVENTS = new QName(NS_COMPONENTS_PREFIX, "caseTabEvents");
     public static final String UI_CASE_TAB_EVENTS_URL = QNameUtil.qNameToUri(UI_CASE_TAB_EVENTS);
 
@@ -93,4 +96,37 @@ public class ComponentConstants {
     public static final QName UI_CASE_TAB_OVERVIEW_APPROVAL = new QName(NS_COMPONENTS_PREFIX, "caseTabOverviewApproval");
     public static final String UI_CASE_TAB_OVERVIEW_APPROVAL_URL = QNameUtil.qNameToUri(UI_CASE_TAB_OVERVIEW_APPROVAL);
 
+    public static final QName UI_TASK_TAB_BASIC = new QName(NS_COMPONENTS_PREFIX, "taskTabBasic");
+    public static final String UI_TASK_TAB_BASIC_URL = QNameUtil.qNameToUri(UI_TASK_TAB_BASIC);
+
+    public static final QName UI_TASK_TAB_SCHEDULE = new QName(NS_COMPONENTS_PREFIX, "taskTabSchedule");
+    public static final String UI_TASK_TAB_SCHEDULE_URL = QNameUtil.qNameToUri(UI_TASK_TAB_SCHEDULE);
+
+    public static final QName UI_TASK_TAB_WORK_MANAGEMENT = new QName(NS_COMPONENTS_PREFIX, "taskTabWorkManagement");
+    public static final String UI_TASK_TAB_WORK_MANAGEMENT_URL = QNameUtil.qNameToUri(UI_TASK_TAB_WORK_MANAGEMENT);
+
+    public static final QName UI_TASK_TAB_CLEANUP_POLICIES = new QName(NS_COMPONENTS_PREFIX, "taskTabCleanupPolicies");
+    public static final String UI_TASK_TAB_CLEANUP_POLICIES_URL = QNameUtil.qNameToUri(UI_TASK_TAB_CLEANUP_POLICIES);
+
+    public static final QName UI_TASK_TAB_SUBTASKS = new QName(NS_COMPONENTS_PREFIX, "taskTabSubtasks");
+    public static final String UI_TASK_TAB_SUBTASKS_URL = QNameUtil.qNameToUri(UI_TASK_TAB_SUBTASKS);
+
+    public static final QName UI_TASK_TAB_OPERATION_STATISTICS = new QName(NS_COMPONENTS_PREFIX, "taskTabOperationStatistics");
+    public static final String UI_TASK_TAB_OPERATION_STATISTICS_URL = QNameUtil.qNameToUri(UI_TASK_TAB_OPERATION_STATISTICS);
+
+    public static final QName UI_TASK_TAB_ENVIRONMENTAL_PERFORMANCE = new QName(NS_COMPONENTS_PREFIX, "taskTabEnvironmentalPerformance");
+    public static final String UI_TASK_TAB_ENVIRONMENTAL_PERFORMANCE_URL = QNameUtil.qNameToUri(UI_TASK_TAB_ENVIRONMENTAL_PERFORMANCE);
+
+    public static final QName UI_TASK_TAB_OPERATION = new QName(NS_COMPONENTS_PREFIX, "taskTabOperation");
+    public static final String UI_TASK_TAB_OPERATION_URL = QNameUtil.qNameToUri(UI_TASK_TAB_OPERATION);
+
+    public static final QName UI_TASK_TAB_INTERNAL_PERFORMANCE = new QName(NS_COMPONENTS_PREFIX, "taskTabInternalPerformance");
+    public static final String UI_TASK_TAB_INTERNAL_PERFORMANCE_URL = QNameUtil.qNameToUri(UI_TASK_TAB_INTERNAL_PERFORMANCE);
+
+    public static final QName UI_TASK_TAB_RESULT = new QName(NS_COMPONENTS_PREFIX, "taskTabResult");
+    public static final String UI_TASK_TAB_RESULT_URL = QNameUtil.qNameToUri(UI_TASK_TAB_RESULT);
+
+    public static final QName UI_TASK_TAB_ERRORS = new QName(NS_COMPONENTS_PREFIX, "taskTabErrors");
+    public static final String UI_TASK_TAB_ERRORS_URL = QNameUtil.qNameToUri(UI_TASK_TAB_ERRORS);
+
 }

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

@@ -217,5 +217,9 @@ public class GuiStyleConstants {
     public static final String CLASS_ICON_CLAIM = "fa fa-paper-plane-o";
     public static final String CLASS_ICON_TEXT = "fa fa-text-width";
 
+    public static final String CLASS_ICON_TRASH = "fa fa-trash-o";
+    public static final String CLASS_ICON_PERFORMANCE = "fa fa-area-chart";
+    public static final String CLASS_ICON_TASK_RESULTS = "fa fa-list-alt";
+
 
 }