[midPoint-git] [Evolveum/midpoint] 2cf62f: MID-7706: skip evaluate construction in assignment
Katarina Bolemant
noreply at github.com
Wed Mar 16 10:56:02 CET 2022
Branch: refs/heads/feature/detaching
Home: https://github.com/Evolveum/midpoint
Commit: 2cf62fc271a1859ac725a38e9938970edd6eeca1
https://github.com/Evolveum/midpoint/commit/2cf62fc271a1859ac725a38e9938970edd6eeca1
Author: lskublik <lskublik at evolveum.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/DirectAndIndirectAssignmentPanel.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/ConstructionEvaluation.java
Log Message:
-----------
MID-7706: skip evaluate construction in assignment
Commit: f05913a802bcb6c097c57e4798d5999ea714dc17
https://github.com/Evolveum/midpoint/commit/f05913a802bcb6c097c57e4798d5999ea714dc17
Author: lskublik <lskublik at evolveum.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqaleRepositoryBeanConfig.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/schemacheck/SchemaActionComputer.java
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master'
Commit: 95481cf0319ffaf954640a9274d01b7411adf233
https://github.com/Evolveum/midpoint/commit/95481cf0319ffaf954640a9274d01b7411adf233
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/CorrelationCaseManager.java
Log Message:
-----------
Improve correlation case naming
Now it includes also resource name (not only the shadow name).
Commit: 5724012663fbd9d6eca2ba895346398180105615
https://github.com/Evolveum/midpoint/commit/5724012663fbd9d6eca2ba895346398180105615
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/DirectAndIndirectAssignmentPanel.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/CollectionProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/ConstructionEvaluation.java
M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqaleRepositoryBeanConfig.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/schemacheck/SchemaActionComputer.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 68c22f9ac6c408dfdadd950c100ff8853e31cc5f
https://github.com/Evolveum/midpoint/commit/68c22f9ac6c408dfdadd950c100ff8853e31cc5f
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/ConstructionEvaluation.java
Log Message:
-----------
Slightly improve outbound processing checking
Commit: 24e4d2d5a4825ed83caa5bbc2bfb66a07af61b61
https://github.com/Evolveum/midpoint/commit/24e4d2d5a4825ed83caa5bbc2bfb66a07af61b61
Author: kate <honchar at evolveum.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationalButtonsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusHistoryPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/PageOrgHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/PageOrgHistory.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRoleHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRoleHistory.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageServiceHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageServiceHistory.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/user/PageUserHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/user/PageUserHistory.java
Log Message:
-----------
focus object history page fix
Commit: 0d56ee07558499f5485064bcd9e13f0f022f42b7
https://github.com/Evolveum/midpoint/commit/0d56ee07558499f5485064bcd9e13f0f022f42b7
Author: Richard Richter <richard.richter at evolveum.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/objectCollection/PageObjectCollections.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/objectTemplate/PageObjectTemplates.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
Log Message:
-----------
MainObjectListPanel: fixed getConfirmMessageKeyForMulti-v-SingleObject
The names of the methods were reversed, but the returned keys were OK.
Also, default impl now throws with clearer error, previously it returned
null which soon threw IllegalArgEx, but with message without context.
Commit: 60dd30f408c0c4c0e00d0ae617e8f3540341c530
https://github.com/Evolveum/midpoint/commit/60dd30f408c0c4c0e00d0ae617e8f3540341c530
Author: Richard Richter <richard.richter at evolveum.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/messagetemplate/PageMessageTemplates.java
Log Message:
-----------
PageMessageTemplates: added missing delete confirmation msg (fixes 500)
Commit: 5a72961693055ef680522a316b60acf4907d16c0
https://github.com/Evolveum/midpoint/commit/5a72961693055ef680522a316b60acf4907d16c0
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M pom.xml
Log Message:
-----------
Upgrade Quartz to 2.3.2.e3
This should fix occasional NPEs in scheduler thread (MID-4558).
Commit: fa64946e652ea153ec3b59e141372bb6c4e177cc
https://github.com/Evolveum/midpoint/commit/fa64946e652ea153ec3b59e141372bb6c4e177cc
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationalButtonsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusHistoryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/messagetemplate/PageMessageTemplates.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/PageOrgHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/PageOrgHistory.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRoleHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRoleHistory.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageServiceHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageServiceHistory.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/user/PageUserHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/user/PageUserHistory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/objectCollection/PageObjectCollections.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/objectTemplate/PageObjectTemplates.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 90736e7178d27d1745db1c92426b0e693f5113ae
https://github.com/Evolveum/midpoint/commit/90736e7178d27d1745db1c92426b0e693f5113ae
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ExportActivitySupport.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/controller/ContainerableReportDataSource.java
Log Message:
-----------
Change reports to iterative search mode
Reports were executed by gathering objects via full-run (non-iterative)
search method - for audit records, objects, and containers. Here we
change the execution mode for the first two of them to iterative search.
This should partially resolve MID-7737 by lifting the limit of 10000
processed objects.
Experimental: the TestCsvReportExportClassic fails!
Commit: c0d817bb46b02a108ca5cc23ac38507705a3c082
https://github.com/Evolveum/midpoint/commit/c0d817bb46b02a108ca5cc23ac38507705a3c082
Author: lskublik <lskublik at evolveum.com>
Date: 2022-03-16 (Wed, 16 Mar 2022)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/ItemDeltaBeanToNativeConversion.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
A infra/schema/src/test/resources/deltaconverter/resource-modify-non-exists-attribute.xml
Log Message:
-----------
MID-7723: fix convert non exist attribute with non exists parent to native item delta
Commit: d9e654ae0c555903bef60322c06b51fa8174d536
https://github.com/Evolveum/midpoint/commit/d9e654ae0c555903bef60322c06b51fa8174d536
Author: lskublik <lskublik at evolveum.com>
Date: 2022-03-16 (Wed, 16 Mar 2022)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationalButtonsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusHistoryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/messagetemplate/PageMessageTemplates.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/PageOrgHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/PageOrgHistory.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRoleHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRoleHistory.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageServiceHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageServiceHistory.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/user/PageUserHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/user/PageUserHistory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/objectCollection/PageObjectCollections.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/objectTemplate/PageObjectTemplates.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/CorrelationCaseManager.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/ConstructionEvaluation.java
M pom.xml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master'
Commit: d2a411adec8d3b8a25bee332b8dded5bd4c21d74
https://github.com/Evolveum/midpoint/commit/d2a411adec8d3b8a25bee332b8dded5bd4c21d74
Author: lskublik <lskublik at evolveum.com>
Date: 2022-03-16 (Wed, 16 Mar 2022)
Changed paths:
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ExportActivitySupport.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/controller/ContainerableReportDataSource.java
Log Message:
-----------
Merge remote-tracking branch 'origin/tmp/mid-7737'
Commit: cf21294cf9ef678c59881603657a94f374b69cc2
https://github.com/Evolveum/midpoint/commit/cf21294cf9ef678c59881603657a94f374b69cc2
Author: lskublik <lskublik at evolveum.com>
Date: 2022-03-16 (Wed, 16 Mar 2022)
Changed paths:
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
Log Message:
-----------
MID-7723: cleanup messages in test
Commit: 27de9e7a67c6bdb2d762e5322a7cf924fa6bf035
https://github.com/Evolveum/midpoint/commit/27de9e7a67c6bdb2d762e5322a7cf924fa6bf035
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-03-16 (Wed, 16 Mar 2022)
Changed paths:
A infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectHandler.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicCollectionReportExportActivityRun.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicDashboardReportExportActivityRun.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ExportActivitySupport.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ReportDataCreationActivityRun.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/controller/ContainerableReportDataSource.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/controller/ReportDataSource.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resourceobjects/EntitlementConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resourceobjects/ResourceObjectConverter.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
R provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ObjectHandler.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/UcfObjectFound.java
A provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/UcfObjectHandler.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/provisioning/AsyncProvisioningConnectorInstance.java
M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/update/AsyncUpdateConnectorInstance.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/SearchExecutor.java
M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummy.java
M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummyMulti.java
M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfOpenDj.java
Log Message:
-----------
Fix working with OperationResult in Handler
OperationResult should be filled-in according to the code call
structure, i.e. called code should use the result of the parent.
The use of Handler interface, passing values to be processed but without
the corresponding OperationResult, is not correct in this respect.
So here are the following changes:
1. Introduced ObjectHandler interface that contains not only the value
but also the OperationResult instance. [TODO: better name?]
2. Used ObjectHandler for iterative processing in reports, instead of
Handler.
3. Renamed ObjectHandler in UCF API to UcfObjectHandler, to avoid naming
collisions.
Related to MID-7737.
Commit: b5c78482c379f9c03a7c5c977ef01a47bae1c0a9
https://github.com/Evolveum/midpoint/commit/b5c78482c379f9c03a7c5c977ef01a47bae1c0a9
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-03-16 (Wed, 16 Mar 2022)
Changed paths:
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: eabc94fe8e3e713d51facb2def5dd5ebce997ed0
https://github.com/Evolveum/midpoint/commit/eabc94fe8e3e713d51facb2def5dd5ebce997ed0
Author: lskublik <lskublik at evolveum.com>
Date: 2022-03-16 (Wed, 16 Mar 2022)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/ItemDeltaBeanToNativeConversion.java
Log Message:
-----------
MID-7723: cleanup comment for parentDefinition
Commit: fb2ecfbacb84a6753691f0cebd4e07fa47243d4f
https://github.com/Evolveum/midpoint/commit/fb2ecfbacb84a6753691f0cebd4e07fa47243d4f
Author: lskublik <lskublik at evolveum.com>
Date: 2022-03-16 (Wed, 16 Mar 2022)
Changed paths:
A infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectHandler.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicCollectionReportExportActivityRun.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicDashboardReportExportActivityRun.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ExportActivitySupport.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ReportDataCreationActivityRun.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/controller/ContainerableReportDataSource.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/controller/ReportDataSource.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resourceobjects/EntitlementConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resourceobjects/ResourceObjectConverter.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
R provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ObjectHandler.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/UcfObjectFound.java
A provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/UcfObjectHandler.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/provisioning/AsyncProvisioningConnectorInstance.java
M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/update/AsyncUpdateConnectorInstance.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/SearchExecutor.java
M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummy.java
M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummyMulti.java
M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfOpenDj.java
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master'
Commit: c85514923c459be465f7c7554acd22399c94c82d
https://github.com/Evolveum/midpoint/commit/c85514923c459be465f7c7554acd22399c94c82d
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2022-03-16 (Wed, 16 Mar 2022)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/DirectAndIndirectAssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationalButtonsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusHistoryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/messagetemplate/PageMessageTemplates.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/PageOrgHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/PageOrgHistory.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRoleHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRoleHistory.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageServiceHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageServiceHistory.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/user/PageUserHistory.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/user/PageUserHistory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/objectCollection/PageObjectCollections.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/objectTemplate/PageObjectTemplates.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/ItemDeltaBeanToNativeConversion.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectHandler.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
A infra/schema/src/test/resources/deltaconverter/resource-modify-non-exists-attribute.xml
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/CorrelationCaseManager.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/ConstructionEvaluation.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicCollectionReportExportActivityRun.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicDashboardReportExportActivityRun.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ExportActivitySupport.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ReportDataCreationActivityRun.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/controller/ContainerableReportDataSource.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/controller/ReportDataSource.java
M pom.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resourceobjects/EntitlementConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resourceobjects/ResourceObjectConverter.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
R provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ObjectHandler.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/UcfObjectFound.java
A provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/UcfObjectHandler.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/provisioning/AsyncProvisioningConnectorInstance.java
M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/update/AsyncUpdateConnectorInstance.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/SearchExecutor.java
M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummy.java
M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummyMulti.java
M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfOpenDj.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/detaching
# Conflicts:
# gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
Compare: https://github.com/Evolveum/midpoint/compare/06e8958f8c92...c85514923c45
More information about the midPoint-svn
mailing list