Skip to content

Commit

Permalink
Merge branch 'master' into feature/new-ws
Browse files Browse the repository at this point in the history
  • Loading branch information
@virgo47
virgo47 committed Apr 16, 2020
2 parents 0c02eb5 + b0c86bf commit 9e1cc5b
Show file tree
Hide file tree
Showing 227 changed files with 12,957 additions and 3,334 deletions.
13 changes: 8 additions & 5 deletions NEWS
View file
@@ -1,9 +1,12 @@
midPoint 4.0.1 "Gutenberg" Update 1
-----------------------------------
midPoint 4.1 "Pasteur"
----------------------

Release 4.0.1 is a twenty ninth midPoint release. It is the fist maintenance update for 4.0.x version family code-named code-named Gutenberg. The 4.0.x is a long-term support (LTS) version family. The 4.0.1 release brings bugfixes and minor improvements.
Release 4.1 is a thirty-second midPoint release code-named Pasteur.
The 4.1 release brings major authentication improvements, user interface improvements, improved archetype functionality and a number of smaller improvements.

Release date: 22nd October 2019
Release date: 9th April 2020
Release type: Feature release
End of support: 9th April 2021

Please see the release notes for detailed list of changes:
https://wiki.evolveum.com/display/midPoint/Release+4.0.1
https://wiki.evolveum.com/display/midPoint/Release+4.1
2 changes: 1 addition & 1 deletion README
View file
@@ -1,4 +1,4 @@
MidPoint 4.1 Development Branch
MidPoint 4.2 Development Branch
-------------------------------

General information:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
@@ -1,4 +1,4 @@
MidPoint 4.1 Development Branch
MidPoint 4.2 Development Branch
-------------------------------

General information:
Expand Down
2 changes: 1 addition & 1 deletion RELEASE-NOTES
View file
@@ -1,4 +1,4 @@
To see actual releases notes please go to:

https://wiki.evolveum.com/display/midPoint/Release+4.0.1
https://wiki.evolveum.com/display/midPoint/Release+4.1

211 changes: 211 additions & 0 deletions config/initial-objects/000-system-configuration.xml
View file
Expand Up @@ -8,6 +8,7 @@
<systemConfiguration oid="00000000-0000-0000-0000-000000000001" version="0"
xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3"
xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3"
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
<name>SystemConfiguration</name>
Expand Down Expand Up @@ -277,7 +278,217 @@
</collectionRef>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>reconciliation-tasks-view</identifier>
<refreshInterval>30</refreshInterval>
<type>TaskType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000501" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>recomputation-tasks-view</identifier>
<refreshInterval>30</refreshInterval>
<type>TaskType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000502" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>import-tasks-view</identifier>
<refreshInterval>30</refreshInterval>
<type>TaskType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000503" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>live-sync-tasks-view</identifier>
<refreshInterval>30</refreshInterval>
<type>TaskType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000504" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>async-update-tasks-view</identifier>
<refreshInterval>30</refreshInterval>
<type>TaskType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000505" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>cleanup-tasks-view</identifier>
<refreshInterval>30</refreshInterval>
<type>TaskType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000506" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>report-tasks-view</identifier>
<refreshInterval>30</refreshInterval>
<type>TaskType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000507" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>single-bulk-action-tasks-view</identifier>
<refreshInterval>30</refreshInterval>
<type>TaskType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000508" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>iterative-bulk-action-tasks-view</identifier>
<refreshInterval>30</refreshInterval>
<type>TaskType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000509" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>certification-tasks-view</identifier>
<refreshInterval>30</refreshInterval>
<type>TaskType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000520" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>approval-tasks-view</identifier>
<refreshInterval>30</refreshInterval>
<type>TaskType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000521" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>utility-tasks-view</identifier>
<refreshInterval>30</refreshInterval>
<type>TaskType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000528" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>system-tasks-view</identifier>
<refreshInterval>30</refreshInterval>
<type>TaskType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000529" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
</objectCollectionViews>
<objectDetails>
<objectDetailsPage>
<type>c:TaskType</type>
<container>
<displayOrder>150</displayOrder>
<display>
<label>Advanced options</label>
</display>
<item>
<c:path>cleanupAfterCompletion</c:path>
</item>
<item>
<c:path>threadStopAction</c:path>
</item>
<item>
<c:path>binding</c:path>
</item>
<item>
<c:path>dependent</c:path>
</item>
</container>
<container>
<displayOrder>900</displayOrder>
<display>
<label>Operational attributes (state)</label>
</display>
<item>
<c:path>executionStatus</c:path>
</item>
<item>
<c:path>node</c:path>
</item>
<item>
<c:path>nodeAsObserved</c:path>
</item>
<item>
<c:path>resultStatus</c:path>
</item>
<item>
<c:path>result</c:path>
</item>
<item>
<c:path>nextRunStartTimestamp</c:path>
</item>
<item>
<c:path>nextRetryTimestamp</c:path>
</item>
<item>
<c:path>unpauseAction</c:path>
</item>
<item>
<c:path>taskIdentifier</c:path>
</item>
<item>
<c:path>parent</c:path>
</item>
<item>
<c:path>waitingReason</c:path>
</item>
<item>
<c:path>stateBeforeSuspend</c:path>
</item>
<item>
<c:path>category</c:path>
</item>
<item>
<c:path>otherHandlersUriStack</c:path>
</item>
<item>
<c:path>channel</c:path>
</item>
<item>
<c:path>subtaskRef</c:path>
</item>
<item>
<c:path>dependentTaskRef</c:path>
</item>
<item>
<c:path>lastRunStartTimestamp</c:path>
</item>
<item>
<c:path>lastRunFinishTimestamp</c:path>
</item>
<item>
<c:path>completionTimestamp</c:path>
</item>
</container>
<container>
<displayOrder>910</displayOrder>
<visibility>hidden</visibility>
<display>
<label>Operational attributes (progress)</label>
</display>
<item>
<c:path>progress</c:path>
</item>
<item>
<c:path>expectedTotal</c:path>
</item>
<item>
<c:path>stalledSince</c:path>
</item>
</container>

</objectDetailsPage>
</objectDetails>
</adminGuiConfiguration>

<expressions>
Expand Down
23 changes: 11 additions & 12 deletions config/initial-objects/110-report-user-list.xml
View file

Large diffs are not rendered by default.

124 changes: 124 additions & 0 deletions config/initial-objects/501-archetype-task-reconciliation.xml
View file
@@ -0,0 +1,124 @@
<!--
~ Copyright (c) 2020 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-000000000501"
xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3">
<name>Reconciliation task</name>
<archetypePolicy>
<display>
<label>Reconciliation task</label>
<pluralLabel>Reconciliation tasks</pluralLabel>
<icon>
<cssClass>fa fa-exchange</cssClass>
<color>green</color>
</icon>
</display>
<itemConstraint>
<path>extension</path>
<visibility>vacant</visibility>
</itemConstraint>
<itemConstraint>
<path>extension/mext:objectclass</path>
<visibility>visible</visibility>
</itemConstraint>
<itemConstraint>
<path>extension/mext:kind</path>
<visibility>visible</visibility>
</itemConstraint>
<itemConstraint>
<path>extension/mext:intent</path>
<visibility>visible</visibility>
</itemConstraint>
<itemConstraint>
<path>extension/mext:objectQuery</path>
<visibility>visible</visibility>
</itemConstraint>
<itemConstraint>
<path>extension/mext:workerThreads</path>
<visibility>visible</visibility>
</itemConstraint>
<itemConstraint>
<path>extension/mext:finishOperationsOnly</path>
<visibility>visible</visibility>
</itemConstraint>
<itemConstraint>
<path>extension/mext:dryRun</path>
<visibility>visible</visibility>
</itemConstraint>
<adminGuiConfiguration>
<objectDetails>
<type>c:TaskType</type>
<container>
<display>
<label>ReconciliationTask.resourceObjects</label>
</display>
<item>
<c:path>objectRef</c:path>
</item>
<item>
<c:path>extension/mext:objectclass</c:path>
</item>
<item>
<c:path>extension/mext:kind</c:path>
</item>
<item>
<c:path>extension/mext:intent</c:path>
</item>
<item>
<c:path>extension/mext:objectQuery</c:path>
</item>
</container>
<container>
<display>
<label>ReconciliationTask.reconciliationOptions</label>
</display>
<item>
<c:path>extension/mext:workerThreads</c:path>
</item>
<item>
<c:path>extension/mext:finishOperationsOnly</c:path>
</item>
<item>
<c:path>extension/mext:dryRun</c:path>
</item>
</container>
</objectDetails>
</adminGuiConfiguration>
</archetypePolicy>
<assignment>
<assignmentRelation>
<holderType>TaskType</holderType>
</assignmentRelation>
</assignment>
<inducement>
<focusMappings>
<mapping>
<strength>weak</strength>
<expression>
<value>http://midpoint.evolveum.com/xml/ns/public/model/synchronization/task/reconciliation/handler-3</value>
</expression>
<target>
<c:path>handlerUri</c:path>
</target>
</mapping>
</focusMappings>
</inducement>
<inducement>
<focusMappings>
<mapping>
<strength>weak</strength>
<expression>
<value>Reconciliation</value>
</expression>
<target>
<c:path>category</c:path>
</target>
</mapping>
</focusMappings>
</inducement>
</archetype>

0 comments on commit 9e1cc5b

Please sign in to comment.