[midPoint-git] [Evolveum/midpoint] 43a74f: Continue with merging of resource object types

[mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 43a74fb86210fe232fe0f15995383a5bff0b1d91
      https://github.com/Evolveum/midpoint/commit/43a74fb86210fe232fe0f15995383a5bff0b1d91
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-05-10 (Tue, 10 May 2022)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/BaseMergeOperation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/GenericItemMerger.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/key/DefaultNaturalKeyImpl.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/key/NaturalKey.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/key/SingletonItemPathNaturalKeyImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/objdef/LimitationsMerger.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/objdef/ResourceObjectTypeDefinitionMergeOperation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/resource/ResourceMergeOperation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAssociationDefinition.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/resources/TestResourceTemplateMerge.java
    A provisioning/provisioning-impl/src/test/resources/merge/resource-additional-connectors-template.xml
    A provisioning/provisioning-impl/src/test/resources/merge/resource-basic-template.xml
    M provisioning/provisioning-impl/src/test/resources/merge/resource-object-types-1.xml
    A provisioning/provisioning-impl/src/test/resources/merge/resource-object-types-template.xml
    R provisioning/provisioning-impl/src/test/resources/merge/resource-template-additional-connectors.xml
    R provisioning/provisioning-impl/src/test/resources/merge/resource-template-basic.xml
    R provisioning/provisioning-impl/src/test/resources/merge/resource-template-object-types.xml

  Log Message:
  -----------
  Continue with merging of resource object types

1. Added merging of associations.
2. Added merging of limitations (a guess until MID-7929 is done).
3. Key in attributes/associations (ref) is compared and merged in
a special way - regarding the qualification status.

Other changes:

- PropertyLimitationsType and PropertyAccessType are now Containerable.
- ResourceAssociationDefinition is now DebugDumpable.


  Commit: b90e191de0e2b10e7a133a1379e6029a24630b53
      https://github.com/Evolveum/midpoint/commit/b90e191de0e2b10e7a133a1379e6029a24630b53
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-05-10 (Tue, 10 May 2022)

  Changed paths:
    M gui/admin-gui/src/frontend/_to-remove/less/midpoint-theme-variables.less
    M gui/admin-gui/src/frontend/js/midpoint-theme.js
    M gui/admin-gui/src/frontend/scss/midpoint-theme.scss
    M gui/admin-gui/src/frontend/scss/prism-forms.scss
    M gui/admin-gui/src/frontend/scss/vendors.scss
    A gui/admin-gui/src/frontend/scss/wicket.scss
    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/api/component/autocomplete/AbstractAutoCompletePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/component/TaskOperationalButtonsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/DefaultContainerablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ExpressionPropertyHeaderPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerValueHeaderPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ProvenanceMetadataPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/Popover.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleConstraintsExpandablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableConfigurationPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueObjectChoosePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneButtonPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/audit/SqaleAuditService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


Compare: https://github.com/Evolveum/midpoint/compare/124a9396dd75...b90e191de0e2