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

…old-forms * origin/master: (45 commits) LeftMenuPanel: code cleanup and generics improvements DefaultGuiConfigurationCompiler: cleanup, generics, added missing log MenuItem: added @SaveVarargs for the constructors MidPointApplication: MOUNT_FORBID(D)EN_ERROR typo fix PageMounter.scanPackagesForPages now scans the right packages + cleanup SecurityEnforcerImpl: code cleanup, authorities loop simplified, typos common-core-3.xsd: schema XML cleanup and typo fixes schema: fix of enum value ARCHETYPE_EXECUTE_DE(TL)AS_TASK schema: ResourceConsistencyType.reshreshOnRead -> refreshOnRead POM: introduced ${prism.version}, with value of ${project.version} ReportUtils: fixing datetime format; TODO about - vs : in time part changed default key to 256bit, previously it was created as 128bit Add task suspension check for distributed reports Simplify ClassicReportImportActivityRun Next development version: 4.6-SNAPSHOT Version 4.5 (Nightingale) initial objects -> config MID-7780 page storage cleanup, wip MID-7780 page storage cleanup, wip MID-7780 page storage cleanup started ... # Conflicts: # gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
Evolveum · Apr 12, 2022 · f4b46a0 · f4b46a0
2 parents 037eef1 + 5b2bac6
commit f4b46a0
Show file tree

Hide file tree

Showing 238 changed files with 5,603 additions and 4,144 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ sudo: required
 dist: trusty
 language: java
 
-#skips default install - see script bellow
+#skips default install - see script below
 install: true
 
 cache:

diff --git a/INSTALL b/INSTALL
@@ -7,7 +7,7 @@ https://docs.evolveum.com/midpoint/install/source/
 
 1. Prerequisites:
 
-    1. Java (JDK) 11
+    1. Java (JDK) 11 or 17
     2. Apache Maven 3
     3. midPoint source code retrieved via Git
 

diff --git a/INSTALL-dist b/INSTALL-dist
@@ -8,7 +8,7 @@ and release notes can be found at:
 
 1. Prerequisites:
 
-    Java (JRE) 11
+    Java (JRE) 11 or 17
 
 2. Install midPoint
 

diff --git a/NEWS b/NEWS
@@ -1,14 +1,12 @@
-midPoint 4.4 "Tesla"
-----------------------
+midPoint 4.5 "Nightingale"
+--------------------------
 
-Release 4.4 is thirty-seventh midPoint release code-named Tesla.
-The 4.4 release brings major performance and scalability improvements implemented in scope of
-midScale project. In addition to that there are significant user experience and reporting
-improvements.
+Release 4.5 is a fortieth midPoint release code-named Nightingale.
+The 4.5 release brings identity matching capabilities, support for OpenID Connect, notification, user interface and other improvements.
 
-Release date: 26th November 2021
-Release type: Long-term support release
-End of support: 26th November 2024
+Release date: 11th April 2022
+Release type: Feature release
+End of support: 11th April 2023
 
 Please see the release notes for detailed list of changes:
-https://docs.evolveum.com/midpoint/release/4.4/
+https://docs.evolveum.com/midpoint/release/4.5/
diff --git a/README b/README
@@ -1,4 +1,4 @@
-MidPoint 4.5 Development Branch
+MidPoint 4.6 Development Branch
 -------------------------------
 
 General information:

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-MidPoint 4.5 Development Branch
+MidPoint 4.6 Development Branch
 -------------------------------
 
 General information:

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
@@ -1,3 +1,3 @@
 To see actual releases notes please go to:
 
-https://docs.evolveum.com/midpoint/release/4.4/
+https://docs.evolveum.com/midpoint/release/4.6/
diff --git a/config/initial-objects/000-system-configuration.xml b/config/initial-objects/000-system-configuration.xml
@@ -415,6 +415,114 @@
                     </collectionRef>
                 </collection>
             </objectCollectionView>
+            <objectCollectionView>
+                <identifier>shadow-integrity-check-task-view</identifier>
+                <refreshInterval>30</refreshInterval>
+                <applicableForOperation>add</applicableForOperation>
+                <type>TaskType</type>
+                <collection>
+                    <collectionRef oid="00000000-0000-0000-0000-000000000513" relation="org:default" type="c:ArchetypeType"/>
+                </collection>
+            </objectCollectionView>
+            <objectCollectionView>
+                <identifier>shadows-refresh-task-view</identifier>
+                <refreshInterval>30</refreshInterval>
+                <applicableForOperation>add</applicableForOperation>
+                <type>TaskType</type>
+                <collection>
+                    <collectionRef oid="00000000-0000-0000-0000-000000000514" relation="org:default" type="c:ArchetypeType"/>
+                </collection>
+            </objectCollectionView>
+            <objectCollectionView>
+                <identifier>objects-delete-task-view</identifier>
+                <refreshInterval>30</refreshInterval>
+                <applicableForOperation>add</applicableForOperation>
+                <type>TaskType</type>
+                <collection>
+                    <collectionRef oid="00000000-0000-0000-0000-000000000515" relation="org:default" type="c:ArchetypeType"/>
+                </collection>
+            </objectCollectionView>
+            <objectCollectionView>
+                <identifier>shadows-delete-long-time-not-updated-task-view</identifier>
+                <refreshInterval>30</refreshInterval>
+                <applicableForOperation>add</applicableForOperation>
+                <type>TaskType</type>
+                <collection>
+                    <collectionRef oid="00000000-0000-0000-0000-000000000516" relation="org:default" type="c:ArchetypeType"/>
+                </collection>
+            </objectCollectionView>
+            <objectCollectionView>
+                <identifier>execute-change-task-view</identifier>
+                <refreshInterval>30</refreshInterval>
+                <applicableForOperation>add</applicableForOperation>
+                <type>TaskType</type>
+                <collection>
+                    <collectionRef oid="00000000-0000-0000-0000-000000000517" relation="org:default" type="c:ArchetypeType"/>
+                </collection>
+            </objectCollectionView>
+            <objectCollectionView>
+                <identifier>execute-deltas-task-view</identifier>
+                <refreshInterval>30</refreshInterval>
+                <applicableForOperation>add</applicableForOperation>
+                <type>TaskType</type>
+                <collection>
+                    <collectionRef oid="00000000-0000-0000-0000-000000000518" relation="org:default" type="c:ArchetypeType"/>
+                </collection>
+            </objectCollectionView>
+            <objectCollectionView>
+                <identifier>reindex-repository-task-view</identifier>
+                <refreshInterval>30</refreshInterval>
+                <applicableForOperation>add</applicableForOperation>
+                <type>TaskType</type>
+                <collection>
+                    <collectionRef oid="00000000-0000-0000-0000-000000000519" relation="org:default" type="c:ArchetypeType"/>
+                </collection>
+            </objectCollectionView>
+            <objectCollectionView>
+                <identifier>object-integrity-check-task-view</identifier>
+                <refreshInterval>30</refreshInterval>
+                <applicableForOperation>add</applicableForOperation>
+                <type>TaskType</type>
+                <collection>
+                    <collectionRef oid="00000000-0000-0000-0000-000000000522" relation="org:default" type="c:ArchetypeType"/>
+                </collection>
+            </objectCollectionView>
+            <objectCollectionView>
+                <identifier>validity-task-view</identifier>
+                <refreshInterval>30</refreshInterval>
+                <applicableForOperation>add</applicableForOperation>
+                <type>TaskType</type>
+                <collection>
+                    <collectionRef oid="00000000-0000-0000-0000-000000000530" relation="org:default" type="c:ArchetypeType"/>
+                </collection>
+            </objectCollectionView>
+            <objectCollectionView>
+                <identifier>trigger-task-view</identifier>
+                <refreshInterval>30</refreshInterval>
+                <applicableForOperation>add</applicableForOperation>
+                <type>TaskType</type>
+                <collection>
+                    <collectionRef oid="00000000-0000-0000-0000-000000000531" relation="org:default" type="c:ArchetypeType"/>
+                </collection>
+            </objectCollectionView>
+            <objectCollectionView>
+                <identifier>propagation-task-view</identifier>
+                <refreshInterval>30</refreshInterval>
+                <applicableForOperation>add</applicableForOperation>
+                <type>TaskType</type>
+                <collection>
+                    <collectionRef oid="00000000-0000-0000-0000-000000000532" relation="org:default" type="c:ArchetypeType"/>
+                </collection>
+            </objectCollectionView>
+            <objectCollectionView>
+                <identifier>multi-propagation-task-view</identifier>
+                <refreshInterval>30</refreshInterval>
+                <applicableForOperation>add</applicableForOperation>
+                <type>TaskType</type>
+                <collection>
+                    <collectionRef oid="00000000-0000-0000-0000-000000000533" relation="org:default" type="c:ArchetypeType"/>
+                </collection>
+            </objectCollectionView>
             <objectCollectionView>
                 <identifier>certification-tasks-view</identifier>
                 <refreshInterval>30</refreshInterval>

diff --git a/config/initial-objects/027-archetype-correlation-case.xml b/config/initial-objects/027-archetype-correlation-case.xml
@@ -0,0 +1,56 @@
+<!--
+  ~ Copyright (c) 2019 Evolveum and contributors
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+<archetype oid="00000000-0000-0000-0000-000000000345"
+        xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+        xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
+    <name>Correlation case</name>
+    <description>
+        Archetype for correlation cases.
+    </description>
+    <archetypePolicy>
+        <display>
+            <label>Correlation case</label>
+            <pluralLabel>Correlation cases</pluralLabel>
+            <icon>
+                <cssClass>fe fe-approver-object</cssClass> <!-- TODO -->
+            </icon>
+        </display>
+        <adminGuiConfiguration>
+            <objectDetails>
+                <panel>
+                    <identifier>caseWorkItems</identifier>
+                    <display>
+                        <label>Workitems</label>
+                        <icon>
+                            <cssClass>fa fa-circle-o</cssClass>
+                        </icon>
+                    </display>
+                    <panelType>caseWorkItems</panelType>
+                    <type>c:CaseType</type>
+                </panel>
+                <panel>
+                    <identifier>correlationContext</identifier>
+                    <display>
+                        <label>Correlation</label>
+                        <icon>
+                            <cssClass>fa fa-circle-o</cssClass>
+                        </icon>
+                    </display>
+                    <displayOrder>1</displayOrder>
+                    <panelType>correlationContext</panelType>
+                    <type>c:CaseType</type>
+                    <default>true</default>
+                </panel>
+            </objectDetails>
+        </adminGuiConfiguration>
+    </archetypePolicy>
+    <assignment>
+        <assignmentRelation>
+            <holderType>CaseType</holderType>
+        </assignmentRelation>
+    </assignment>
+</archetype>
diff --git a/config/initial-objects/042-role-reviewer.xml b/config/initial-objects/042-role-reviewer.xml
@@ -19,7 +19,7 @@
             Allow access to list of certification cases in GUI. Allow access to pages that show object details,
             so the reviewer may examine data related to the request.
         </description>
-        <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#certificationDecisions</action>
+        <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#myCertificationDecisions</action>
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#userDetails</action>
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#roleDetails</action>
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#orgUnit</action>

diff --git a/config/initial-objects/140-report-certification-campaigns.xml b/config/initial-objects/140-report-certification-campaigns.xml
@@ -17,6 +17,7 @@
     <objectCollection>
         <collection>
             <filter>
+                <!--  TODO: Convert to Axiom Query -->
                 <q:or>
                     <q:equal>
                         <q:path>state</q:path>

diff --git a/config/initial-objects/150-report-certification-cases.xml b/config/initial-objects/150-report-certification-cases.xml
@@ -17,6 +17,7 @@
     <objectCollection>
         <collection>
             <filter>
+                <!--  TODO: Convert to Axiom Query -->
                 <q:equal>
                     <q:path>../name</q:path>
                     <expression>

diff --git a/config/initial-objects/251-object-collection-resource-up.xml b/config/initial-objects/251-object-collection-resource-up.xml
@@ -30,10 +30,7 @@
     </assignment>
     <type>ResourceType</type>
     <filter>
-        <q:equal>
-            <q:path>operationalState/lastAvailabilityStatus</q:path>
-            <q:value>up</q:value>
-        </q:equal>
+        <q:text>operationalState/lastAvailabilityStatus = "up"</q:text>
     </filter>
     <domain>
         <collectionRef oid="00000000-0000-0000-0001-000000000006" type="c:ObjectCollectionType"/>

diff --git a/config/initial-objects/260-object-collection-task-all.xml b/config/initial-objects/260-object-collection-task-all.xml
@@ -12,8 +12,6 @@
     <name>All tasks</name>
     <type>TaskType</type>
     <filter>
-        <q:equal>
-            <q:path>parent</q:path>
-        </q:equal>
+        <q:text>parent not exists</q:text>>
     </filter>
 </objectCollection>
diff --git a/config/initial-objects/261-object-collection-task-active.xml b/config/initial-objects/261-object-collection-task-active.xml
@@ -30,15 +30,7 @@
     </assignment>
     <type>TaskType</type>
     <filter>
-        <q:and>
-            <q:equal>
-                <q:path>executionState</q:path>
-                <q:value>runnable</q:value>
-            </q:equal>
-            <q:equal>
-                <q:path>parent</q:path>
-            </q:equal>
-        </q:and>
+        <q:text>executionState = "runnable" and parent not exists</q:text>
     </filter>
     <domain>
         <collectionRef oid="00000000-0000-0000-0001-000000000007" type="c:ObjectCollectionType"/>

diff --git a/config/initial-objects/262-object-collection-task-report.xml b/config/initial-objects/262-object-collection-task-report.xml
@@ -12,23 +12,11 @@
     <name>Report tasks</name>
     <type>TaskType</type>
     <filter>
-        <q:or>
-            <q:ref>
-                <q:path>archetypeRef</q:path>
-                <q:value oid="00000000-0000-0000-0000-000000000507"/>
-            </q:ref>
-            <q:ref>
-                <q:path>archetypeRef</q:path>
-                <q:value oid="00000000-0000-0000-0000-000000000510"/>
-            </q:ref>
-            <q:ref>
-                <q:path>archetypeRef</q:path>
-                <q:value oid="00000000-0000-0000-0000-000000000511"/>
-            </q:ref>
-            <q:ref>
-                <q:path>archetypeRef</q:path>
-                <q:value oid="00000000-0000-0000-0000-000000000512"/>
-            </q:ref>
-        </q:or>
+        <q:text>
+            archetypeRef matches (oid = "00000000-0000-0000-0000-000000000507")
+            or archetypeRef matches (oid = "00000000-0000-0000-0000-000000000510")
+            or archetypeRef matches (oid = "00000000-0000-0000-0000-000000000511")
+            or archetypeRef matches (oid = "00000000-0000-0000-0000-000000000512")
+        </q:text>
     </filter>
 </objectCollection>
diff --git a/config/initial-objects/271-object-collection-audit-24h.xml b/config/initial-objects/271-object-collection-audit-24h.xml
@@ -12,6 +12,7 @@
     <name>Audit records in 24h</name>
     <type>AuditEventRecordType</type>
     <filter>
+        <!--  TODO: Convert to Axiom Query -->
         <q:and>
             <q:equal>
                 <q:path>eventStage</q:path>

diff --git a/config/initial-objects/272-object-collection-audit-errors-24h.xml b/config/initial-objects/272-object-collection-audit-errors-24h.xml
@@ -13,6 +13,13 @@
     <name>Error audit records in 24h</name>
     <type>AuditEventRecordType</type>
     <filter>
+        <!--  TODO: Convert to Axiom Query
+        <q:text>
+            eventStage = "execution"
+            and outcome = "fatal_error"
+            and timestamp = `basic.addDuration(basic.currentDateTime(), "-P1D")
+        </q:text>
+        -->
         <q:and>
             <q:equal>
                 <q:path>eventStage</q:path>

diff --git a/config/initial-objects/273-object-collection-audit-modifications-24h.xml b/config/initial-objects/273-object-collection-audit-modifications-24h.xml
@@ -13,6 +13,7 @@
     <name>Modification audit records in 24h</name>
     <type>AuditEventRecordType</type>
     <filter>
+        <!--  TODO: Convert to Axiom Query -->
         <q:and>
             <q:equal>
                 <q:path>eventStage</q:path>

diff --git a/config/initial-objects/330-object-collection-my-cases.xml b/config/initial-objects/330-object-collection-my-cases.xml
@@ -10,6 +10,7 @@
     <name>My cases</name>
     <type>CaseType</type>
     <filter>
+        <!--  TODO: Convert to Axiom Query -->
         <q:and>
             <q:ref>
                 <q:path>requestorRef</q:path>