[midPoint-git] [Evolveum/midpoint] 0d5c9f: Mark values' origin for resource inheritance
mederly
noreply at github.com
Thu Jun 30 23:46:46 CEST 2022
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 0d5c9fa98bf92986d520e12442b2a66944a0f2ec
https://github.com/Evolveum/midpoint/commit/0d5c9fa98bf92986d520e12442b2a66944a0f2ec
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-06-30 (Thu, 30 Jun 2022)
Changed paths:
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/BaseCustomItemMerger.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/BaseItemMerger.java
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
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/IgnoreSourceItemMerger.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/ItemMerger.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/OriginMarker.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/RequiredItemMerger.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/TypeSpecificMergersConfigurator.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/key/DefaultNaturalKeyImpl.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/ObjectTypeDefinitionMerger.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/RefinedResourceSchemaParser.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceObjectTypeDefinitionTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-provisioning-3.xsd
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/resources/TestResourceTemplateMerge.java
M provisioning/provisioning-impl/src/test/resources/merge/resource-basic-2.xml
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ResourceAsserter.java
Log Message:
-----------
Mark values' origin for resource inheritance
When resource inheritance is used, we now mark the origin of prism
values that are being inherited - using provenance metadata.
See OriginMarker for more details.
Also, the matching object type definitions are now automatically merged
during resource merge operation. Previously, they were just linked using
artificial "internal ID" value, and the actual merging was done during
resource schema parsing. This is now eliminated.
More information about the midPoint-svn
mailing list