[midPoint-git] [Evolveum/prism] 6fd741: Extension Definition are not freezable
mederly
noreply at github.com
Thu Apr 18 20:59:01 CEST 2024
Branch: refs/heads/feature/native-associations
Home: https://github.com/Evolveum/prism
Commit: 6fd74169ccb3d168387f621184446d3b9d437938
https://github.com/Evolveum/prism/commit/6fd74169ccb3d168387f621184446d3b9d437938
Author: Tony Tkáčik <tonydamage at gmail.com>
Date: 2024-01-31 (Wed, 31 Jan 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/AbstractFreezable.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ComplexTypeDefinitionImpl.java
Log Message:
-----------
Extension Definition are not freezable
Signed-off-by: Tony Tkáčik <tonydamage at gmail.com>
Commit: 9132b4fcd44c45c1a341624b0357f591ebb623de
https://github.com/Evolveum/prism/commit/9132b4fcd44c45c1a341624b0357f591ebb623de
Author: Katarina Bolemant <k.valalikova at gmail.com>
Date: 2024-01-31 (Wed, 31 Jan 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ComplexTypeDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContextImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaRegistryImpl.java
Log Message:
-----------
prototype for schema reload (extension schema support in DB)
Commit: cf5af2ce510d20e09c6b480f55a13a591a72db2e
https://github.com/Evolveum/prism/commit/cf5af2ce510d20e09c6b480f55a13a591a72db2e
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-11 (Mon, 11 Mar 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Definition.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Merge.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableDefinition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DummyPrismObjectDefinition.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/Annotation.java
M infra/prism-impl/src/main/resources/xml/ns/public/annotation-3.xsd
Log Message:
-----------
merge: merge annotation added
Commit: 1f09c57e1399ec06cd94339b441ba9ed431ed366
https://github.com/Evolveum/prism/commit/1f09c57e1399ec06cd94339b441ba9ed431ed366
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-11 (Mon, 11 Mar 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/crypto/EncryptionException.java
M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ExternalDataType.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: 198b8ebe4967a2f11cb42a5c3c7254a3f307ffee
https://github.com/Evolveum/prism/commit/198b8ebe4967a2f11cb42a5c3c7254a3f307ffee
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-11 (Mon, 11 Mar 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/DefinitionDelegator.java
Log Message:
-----------
merge: compilation fix
Commit: b084f6a490a0df90395344cb29b9c2f92218b5c3
https://github.com/Evolveum/prism/commit/b084f6a490a0df90395344cb29b9c2f92218b5c3
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-12 (Tue, 12 Mar 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/Annotation.java
Log Message:
-----------
merge: annotation handling typo fix
Commit: af668a72f230b3bcabb7df4793a16dca733006a6
https://github.com/Evolveum/prism/commit/af668a72f230b3bcabb7df4793a16dca733006a6
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-13 (Wed, 13 Mar 2024)
Changed paths:
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: 0f42148b62b8b72f12d5d1cd515bd80efe386e67
https://github.com/Evolveum/prism/commit/0f42148b62b8b72f12d5d1cd515bd80efe386e67
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-14 (Thu, 14 Mar 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Definition.java
R infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Merge.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableDefinition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/DefinitionDelegator.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DummyPrismObjectDefinition.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/Annotation.java
M infra/prism-impl/src/main/resources/xml/ns/public/annotation-3.xsd
Log Message:
-----------
merge: merge annotation split into two -> merger, naturalKey. updated annotations in xsd. Implemented new natural key delegator
Commit: e3b6e3e9351eead32cd4d047f4a1662961e6cd4f
https://github.com/Evolveum/prism/commit/e3b6e3e9351eead32cd4d047f4a1662961e6cd4f
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-14 (Thu, 14 Mar 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: 31f86286d0a4d1fa6e0473a9971d2708d50e9713
https://github.com/Evolveum/prism/commit/31f86286d0a4d1fa6e0473a9971d2708d50e9713
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-15 (Fri, 15 Mar 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/query/AxiomQueryLangService.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/AxiomQueryLangServiceImpl.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestQueryCompletion.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestQueryValidation.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: 5b5f77770cb9ce69927219411346ed17f231bf6e
https://github.com/Evolveum/prism/commit/5b5f77770cb9ce69927219411346ed17f231bf6e
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-20 (Wed, 20 Mar 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/query/AxiomQueryLangService.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/query/PrismQuerySerialization.java
M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/dom/DomWriter.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/AxiomQueryCompletionVisitor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/AxiomQueryLangServiceImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/AxiomQueryValidationVisitor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQuerySerializerImpl.java
M infra/prism-impl/src/main/resources/xml/ns/test/foo-1.xsd
M infra/prism-impl/src/main/resources/xml/ns/test/foo-types-1.xsd
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/lex/TestDomParser.java
A infra/prism-impl/src/test/resources/common/xml/messageTemplate.xml
M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
M infra/util/src/test/java/com/evolveum/midpoint/util/DOMUtilTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: 5b2964589384f3e5949473f43d457595e124c8ea
https://github.com/Evolveum/prism/commit/5b2964589384f3e5949473f43d457595e124c8ea
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-21 (Thu, 21 Mar 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/DomToSchemaPostProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/Annotation.java
Log Message:
-----------
merge: fixes in mergers and handling of naturalKey
Commit: a331aaeddd1045c6312f8a54f12513e95cf3bf1f
https://github.com/Evolveum/prism/commit/a331aaeddd1045c6312f8a54f12513e95cf3bf1f
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-25 (Mon, 25 Mar 2024)
Changed paths:
M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: e42a513f7da9c917dafddcc26ff92c1de2f820b1
https://github.com/Evolveum/prism/commit/e42a513f7da9c917dafddcc26ff92c1de2f820b1
Author: Katarina Bolemant <k.valalikova at gmail.com>
Date: 2024-04-03 (Wed, 03 Apr 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Definition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Item.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableComplexTypeDefinition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableDefinition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableItemDefinition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutablePrismContainerDefinition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismPropertyDefinition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismValueCollectionsUtil.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ValueBasedDefinitionLookupHelper.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/crypto/EncryptionException.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/crypto/ProtectedData.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/crypto/SecretsProvider.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/crypto/SecretsResolver.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/ContainerDefinitionDelegator.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/ItemDefinitionDelegator.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/ItemDeltaDelegator.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/ObjectDefinitionDelegator.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/PropertyDefinitionDelegator.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemDeltaCollectionsUtil.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDeltaCollectionsUtil.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDeltaUtil.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/match/MatchingRule.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/match/MatchingRuleRegistry.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/normalization/Normalizer.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/normalization/StringNormalizer.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/NormalizerRegistry.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyStringNormalizer.java
R infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyStringNormalizerRegistry.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/query/AxiomQueryLangService.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/query/PrismQuerySerialization.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/ItemDeltaItem.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/JavaTypeConverter.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/xml/DynamicNamespacePrefixMapper.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
A infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ExternalDataType.java
M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ProtectedDataType.java
M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ComplexTypeDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DummyPrismObjectDefinition.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemFactoryImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContextImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismObjectImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyValueImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceValueImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismValueImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/SimpleTypeDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/crypto/BaseProtector.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/crypto/KeyStoreBasedProtectorImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ObjectDeltaFactoryImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ObjectDeltaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/PropertyDeltaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyItem.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyPropertyImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/dom/DomWriter.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanMarshaller.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismUnmarshaller.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/XNodeProcessorUtil.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/match/DefaultMatchingRule.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/match/DistinguishedNameMatchingRule.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/match/ExchangeEmailAddressesMatchingRule.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/match/MatchingRuleRegistryImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/match/PolyStringNormMatchingRule.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/match/PolyStringOrigMatchingRule.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/match/PolyStringStrictMatchingRule.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/match/StringIgnoreCaseMatchingRule.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/match/UuidMatchingRule.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/match/XmlMatchingRule.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/metadata/ValueMetadataAdapter.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/AbstractConfigurablePolyStringNormalizer.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/AbstractPolyStringNormalizer.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/AlphanumericPolyStringNormalizer.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/Ascii7PolyStringNormalizer.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/BaseStringNormalizer.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/DistinguishedNameNormalizer.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/ExchangeEmailAddressNormalizer.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/LowercaseStringNormalizer.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/NoOpNormalizer.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/NormalizerRegistryFactory.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/NormalizerRegistryImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/PassThroughPolyStringNormalizer.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/PolyStringNormNormalizer.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/PolyStringNormalizerRegistryFactory.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/PolyStringNormalizerRegistryImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/PolyStringOrigNormalizer.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/UuidNormalizer.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/polystring/XmlNormalizer.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/PropertyValueFilterImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/ValueFilterImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/AxiomQueryCompletionVisitor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/AxiomQueryLangServiceImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/AxiomQueryValidationVisitor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/FilterSerializers.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQueryLanguageParserImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQuerySerializerImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/DomToSchemaPostProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaRegistryImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/xml/GlobalDynamicNamespacePrefixMapper.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/xnode/PrimitiveXNodeImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/xnode/XNodeDefinition.java
M infra/prism-impl/src/main/resources/xml/ns/public/annotation-3.xsd
M infra/prism-impl/src/main/resources/xml/ns/public/types-3.xsd
M infra/prism-impl/src/main/resources/xml/ns/test/foo-1.xsd
M infra/prism-impl/src/main/resources/xml/ns/test/foo-types-1.xsd
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/AbstractPrismTest.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPerformance.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismContext.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismSchemaConstruction.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/lex/TestDomParser.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/lex/TestProtectedString.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/match/TestMatchingRule.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/path/ItemPathTest.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConverters.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestBasicQueryConversions.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestQueryCompletion.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestQueryConverters.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestQueryValidation.java
A infra/prism-impl/src/test/resources/common/xml/messageTemplate.xml
A infra/util/src/main/java/com/evolveum/midpoint/util/Checkable.java
M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
A infra/util/src/main/java/com/evolveum/midpoint/util/DependencyGraph.java
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/PrettyPrinter.java
M infra/util/src/main/java/com/evolveum/midpoint/util/exception/SchemaException.java
M infra/util/src/test/java/com/evolveum/midpoint/util/DOMUtilTest.java
A infra/util/src/test/java/com/evolveum/midpoint/util/DependencyGraphTest.java
M infra/util/testng-unit.xml
M pom.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into tmp/do-not-freeze-extensions
* origin/master: (39 commits)
adding javadoc for method that check presence of HTML format in 'code' xml elemet
MID-9506: Added schema notion to Axiom Query Visitors
MID-9506: Added toSearchFilterType to Midpoint Query Serializer
MID-9461: fix writing of CDATA to xml when html format is used
Added item definition to axiom query lang service
Add diagnostic info for MID-9535
MID-9532: Fixed delta duplicates caused by ConditionalSearchFilterType
Back to 4.9-SNAPSHOT development version
Milestone 4.9-M3
change super class for EncryptionException to CommonException
Add MiscUtil#stateNonEmpty method
Support partial impl. of mutable definitions
Fixed JSON ser/deser issues with assocations
MID-9413: Query - Fixed incorrect serialiation of Equals PolyString
secrets provider: added tests for caching, updated documentation, improved environment variables secret provider
Support new associations
secret providers: fixing handling of encrypted/external data in protected data type
secrets providers: support for resolving secrets in BasicExpressionFunctions
secrets providers: protected data improvements
docs/comments: more Jira link fixes
...
# Conflicts:
# infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ComplexTypeDefinitionImpl.java
Commit: 394722dfb0f753cecb479eadf2c3951cd6067dec
https://github.com/Evolveum/prism/commit/394722dfb0f753cecb479eadf2c3951cd6067dec
Author: Katarina Bolemant <k.valalikova at gmail.com>
Date: 2024-04-03 (Wed, 03 Apr 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaDefinitionFactory.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaToDomProcessor.java
Log Message:
-----------
- adding support for serializing enumeration types to SchemaToDomProcessor.
- fixed issue when the annotation a:extension was omitted during serialization. When this annotation was not serialized back from prism to xsd, extension schemas didn't work at all.
Commit: 4173e616139d095dfa438dbd3fab1ec3744ec4c8
https://github.com/Evolveum/prism/commit/4173e616139d095dfa438dbd3fab1ec3744ec4c8
Author: Katarina Bolemant <k.valalikova at gmail.com>
Date: 2024-04-03 (Wed, 03 Apr 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/EnumerationTypeDefinition.java
Log Message:
-----------
making value definition serializable. at least for now.
Commit: 66941062bb026d144842b007c0a607c693228d6a
https://github.com/Evolveum/prism/commit/66941062bb026d144842b007c0a607c693228d6a
Author: Katarina Bolemant <k.valalikova at gmail.com>
Date: 2024-04-15 (Mon, 15 Apr 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/AbstractFreezable.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ComplexTypeDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/DomToSchemaProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/PrismSchemaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaDescriptionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaRegistryImpl.java
Log Message:
-----------
- skip freeze not needed anymore.
- SchemaDescriptionImpl now doesn't use getSchema() and setSchema()
- reload() reloads all schemas for now
Commit: 3de50c739d0c470b141150c52f2e3f01699d2b66
https://github.com/Evolveum/prism/commit/3de50c739d0c470b141150c52f2e3f01699d2b66
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-16 (Tue, 16 Apr 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQueryLanguageParserImpl.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: a08701aed50171a48626db2e3043dd0e1b7eed57
https://github.com/Evolveum/prism/commit/a08701aed50171a48626db2e3043dd0e1b7eed57
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-16 (Tue, 16 Apr 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Definition.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ItemMergerFactory.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MergeStrategy.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableDefinition.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/OriginMarker.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/DefinitionDelegator.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemMerger.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/EquivalenceStrategy.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/ParameterizedEquivalenceStrategy.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/key/NaturalKey.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/BaseItemMerger.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DummyPrismObjectDefinition.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/GenericItemMerger.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemDefinitionImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemMergerFactoryImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContextImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/DefaultNaturalKeyImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/ItemPathNaturalKeyImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/NaturalKeyImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/Annotation.java
Log Message:
-----------
natural key and mergers moved to prism
Commit: 637b323c53905b29b5d6abea0d75829242e7595d
https://github.com/Evolveum/prism/commit/637b323c53905b29b5d6abea0d75829242e7595d
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-16 (Tue, 16 Apr 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/GenericItemMerger.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/ItemPathNaturalKeyImpl.java
Log Message:
-----------
lowered the need for existence of natural key for item path
Commit: 75d4869873acf0d6211a70b923a7a163f25a8e1a
https://github.com/Evolveum/prism/commit/75d4869873acf0d6211a70b923a7a163f25a8e1a
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-16 (Tue, 16 Apr 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/ItemPathNaturalKeyImpl.java
Log Message:
-----------
lowered the need for existence of ngatural key for item path
Commit: 35ba9c43ec09c30d2df99376c6ea5d6e5d1256b2
https://github.com/Evolveum/prism/commit/35ba9c43ec09c30d2df99376c6ea5d6e5d1256b2
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-16 (Tue, 16 Apr 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/EquivalenceStrategy.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismValueImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
Log Message:
-----------
REAL_VALUE_CONSIDER_DIFFERENT_IDS_NATURAL_KEYS implemented
Commit: a3aa87be248f000676b32c9b265f3dd17565bc79
https://github.com/Evolveum/prism/commit/a3aa87be248f000676b32c9b265f3dd17565bc79
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-17 (Wed, 17 Apr 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/EquivalenceStrategy.java
Log Message:
-----------
added simple diff test to try out new strategy, some javadoc
Commit: fadc3f8f655ba1d1d1f88a41a7d187c572951ae4
https://github.com/Evolveum/prism/commit/fadc3f8f655ba1d1d1f88a41a7d187c572951ae4
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-17 (Wed, 17 Apr 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Definition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/DefinitionDelegator.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemMerger.java
R infra/prism-api/src/main/java/com/evolveum/midpoint/prism/key/NaturalKey.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/key/NaturalKeyDefinition.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/BaseItemMerger.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DummyPrismObjectDefinition.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/GenericItemMerger.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemMergerFactoryImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/DefaultNaturalKeyDefinitionImpl.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/DefaultNaturalKeyImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/ItemPathNaturalKeyDefinitionImpl.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/ItemPathNaturalKeyImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/NaturalKeyDefinitionImpl.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/NaturalKeyImpl.java
Log Message:
-----------
renamed NaturalKey to NaturalKeyDefinition
Commit: 61587f3b4635a565140762fe4c4ec3b0ba85b776
https://github.com/Evolveum/prism/commit/61587f3b4635a565140762fe4c4ec3b0ba85b776
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-17 (Wed, 17 Apr 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/ParameterizedEquivalenceStrategy.java
Log Message:
-----------
fixed typo in ParameterizedEquivalenceStrategy
Commit: ba46e83eff2fff5cbdde6b3c76fcc99fc0b9009c
https://github.com/Evolveum/prism/commit/ba46e83eff2fff5cbdde6b3c76fcc99fc0b9009c
Author: skublik <lukas.skublik at gmail.com>
Date: 2024-04-18 (Thu, 18 Apr 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Definition.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ItemMergerFactory.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MergeStrategy.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableDefinition.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/OriginMarker.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/DefinitionDelegator.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemMerger.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/EquivalenceStrategy.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/ParameterizedEquivalenceStrategy.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/key/NaturalKeyDefinition.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/BaseItemMerger.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DummyPrismObjectDefinition.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/GenericItemMerger.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemMergerFactoryImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContextImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismValueImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/DefaultNaturalKeyDefinitionImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/ItemPathNaturalKeyDefinitionImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/NaturalKeyDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQueryLanguageParserImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/DomToSchemaPostProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/Annotation.java
M infra/prism-impl/src/main/resources/xml/ns/public/annotation-3.xsd
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into tmp/do-not-freeze-extensions
Commit: d8d43fd1ff23c6124f9ed539f8240fd6b0161748
https://github.com/Evolveum/prism/commit/d8d43fd1ff23c6124f9ed539f8240fd6b0161748
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2024-04-18 (Thu, 18 Apr 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Definition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/EnumerationTypeDefinition.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ItemMergerFactory.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MergeStrategy.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/OriginMarker.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/DefinitionDelegator.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemMerger.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/EquivalenceStrategy.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/ParameterizedEquivalenceStrategy.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/key/NaturalKeyDefinition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/BaseItemMerger.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ComplexTypeDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DummyPrismObjectDefinition.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/GenericItemMerger.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemMergerFactoryImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContextImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismValueImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/DefaultNaturalKeyDefinitionImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/ItemPathNaturalKeyDefinitionImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/NaturalKeyDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/PrismSchemaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaDescriptionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaDomParser.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaFactoryImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaParsingUtil.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaProcessorUtil.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaRegistryImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaXsomParser.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/Annotation.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/features/DefinitionFeatures.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/features/QNameList.java
M infra/prism-impl/src/main/resources/xml/ns/public/annotation-3.xsd
Log Message:
-----------
Merge branch 'refs/heads/master' into feature/native-associations
Including quite a heavy merging.
# Conflicts:
# infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Definition.java
# infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableDefinition.java
# infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/DefinitionDelegator.java
# infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
# infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DefinitionImpl.java
# infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemDefinitionImpl.java
# infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/DomToSchemaPostProcessor.java
# infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/PrismSchemaImpl.java
# infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaDefinitionFactory.java
# infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaDomParser.java
# infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaRegistryImpl.java
# infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaToDomProcessor.java
# infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/Annotation.java
Compare: https://github.com/Evolveum/prism/compare/3874e2dd4299...d8d43fd1ff23
To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/prism/settings/notifications
More information about the midPoint-svn
mailing list