[midPoint-git] [Evolveum/midpoint] 52d461: Merge branch 'feature/axiom' into feature/metadata...
mederly
noreply at github.com
Thu Jun 18 16:21:49 CEST 2020
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 52d46147d168e9a94c66dfcb6ba1f2a4f6338de4
https://github.com/Evolveum/midpoint/commit/52d46147d168e9a94c66dfcb6ba1f2a4f6338de4
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-06-12 (Fri, 12 Jun 2020)
Changed paths:
A infra/axiom/pom.xml
A infra/axiom/src/main/antlr4/com/evolveum/axiom/lang/antlr/Axiom.g4
A infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomIdentifier.java
A infra/axiom/src/main/java/com/evolveum/axiom/concepts/Lazy.java
A infra/axiom/src/main/java/com/evolveum/axiom/concepts/Optionals.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomBaseDefinition.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomBuiltIn.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomIdentifierDefinition.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomIdentifierDefinitionImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomItemDefinition.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomModel.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomSchemaContext.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomTypeDefinition.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/api/Identifiable.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/api/IdentifierSpaceKey.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/api/stmt/AxiomStatement.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/api/stmt/AxiomStatementStreamListener.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/api/stmt/SourceLocation.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AbstractAxiomBaseDefinition.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomAntlrVisitor.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomErrorListener.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomIdentifierResolver.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomItemDefinitionImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomModelInfo.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomSchemaContextImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomSemanticException.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomStatementBuilder.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomStatementFactoryContext.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomStatementImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomStatementSource.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomStatementStreamBuilder.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomSyntaxException.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomTypeDefinitionImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/BasicStatementRule.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/DefaultItemDefinition.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/DefaultTypeDefinition.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/Deffered.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/DelegatedRequirement.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/ModelReactorContext.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/Requirement.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/RuleErrorMessage.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementContext.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementContextImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementContextResult.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementRule.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementRuleContext.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementRuleContextImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementTreeBuilder.java
A infra/axiom/src/main/resources/axiom-lang.axiom
A infra/axiom/src/test/java/com/evolveum/axiom/lang/test/TestAxiomParser.java
A infra/axiom/src/test/resources/axiom-base-types.axiom
A infra/axiom/src/test/resources/axiom-ideas.adoc
A infra/axiom/src/test/resources/base-example.axiom
A infra/axiom/src/test/resources/common-core.axiom
A infra/axiom/src/test/resources/scripting.axiom
M infra/pom.xml
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
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ValueMetadata.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/metadata/ValueMetadataMockUpFactory.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/PrismPropertyValueImpl.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
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/metadata/ValueMetadataAdapter.java
M infra/prism-impl/src/main/resources/xml/ns/public/annotation-3.xsd
M infra/schema-pure-jaxb/src/compile/resources/catalog.xml
M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/metadata/MidpointValueMetadataMockUpFactory.java
M infra/schema/src/main/resources/META-INF/schemas-in-this-module.xml
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
A infra/schema/src/main/resources/xml/ns/public/common/common-metadata-3.xsd
A infra/schema/src/main/resources/xml/ns/public/common/extension-metadata-3.xsd
A infra/schema/src/main/resources/xml/ns/public/common/extension-metadata-mock-3.xsd
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
A model/model-intest/src/test/resources/metadata/user-alice.xml
Log Message:
-----------
Merge branch 'feature/axiom' into feature/metadata-mappings
Commit: 3fd7ab88da3905264493796a46cd612c6c4338b6
https://github.com/Evolveum/midpoint/commit/3fd7ab88da3905264493796a46cd612c6c4338b6
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-06-12 (Fri, 12 Jun 2020)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/prism/wrapper/PrismContainerValueWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/prism/wrapper/PrismObjectValueWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/prism/wrapper/PrismValueWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/PrismReferenceWrapperColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/PrismReferenceWrapperColumnPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ItemPanelContext.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ItemRealValueModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/PrismContainerPanelContext.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/ItemWrapperFactoryImpl.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/OperationalContainerWrapperFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/PrismContainerWrapperFactoryImpl.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/PrismObjectWrapperFactoryImpl.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/ValueMetadataWrapperFactoryImpl.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ExpressionPropertyPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ItemPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerValuePanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerValuePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismPropertyPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismReferencePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismValuePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ResourceAttributeDefinitionPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ItemWrapperImpl.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismContainerValueWrapperImpl.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismContainerWrapperImpl.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismObjectValueWrapperImpl.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismPropertyValueWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismReferenceValueWrapperImpl.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismValueWrapperImpl.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ValueMetadataWrapperImpl.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/registry/GuiComponentRegistryImpl.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ContainerListDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.java
M infra/axiom/src/main/antlr4/com/evolveum/axiom/lang/antlr/Axiom.g4
A infra/axiom/src/main/java/com/evolveum/axiom/api/AbstractAxiomItem.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/AbstractAxiomValue.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomComplexValue.java
R infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomIdentifier.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomInfraValue.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomItem.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomItemBuilder.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomItemFactory.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomItemImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomName.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomSimpleValue.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomValue.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomValueBuilder.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomValueFactory.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/ComplexValueImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/SimpleValue.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/meta/Inheritance.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/schema/AxiomIdentifierDefinition.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/schema/AxiomIdentifierDefinitionImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/schema/AxiomItemDefinition.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/schema/AxiomNamedDefinition.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/schema/AxiomSchemaContext.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/schema/AxiomTypeDefinition.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/schema/DelegatedItemDefinition.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/stream/AxiomBuilderStreamTarget.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/stream/AxiomItemStream.java
A infra/axiom/src/main/java/com/evolveum/axiom/api/stream/AxiomItemTarget.java
A infra/axiom/src/main/java/com/evolveum/axiom/concepts/AbstractLazy.java
A infra/axiom/src/main/java/com/evolveum/axiom/concepts/Identifiable.java
M infra/axiom/src/main/java/com/evolveum/axiom/concepts/Lazy.java
A infra/axiom/src/main/java/com/evolveum/axiom/concepts/LazyDelegate.java
A infra/axiom/src/main/java/com/evolveum/axiom/concepts/SourceLocation.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AbstractAxiomAntlrVisitor.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomAntlrStatementSource.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomAntlrVisitor.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomAntlrVisitor2.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomErrorListener.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomModelStatementSource.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomBaseDefinition.java
M infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomBuiltIn.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomIdentifierDefinition.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomIdentifierDefinitionImpl.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomItemDefinition.java
M infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomModel.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomSchemaContext.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomTypeDefinition.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/api/Identifiable.java
M infra/axiom/src/main/java/com/evolveum/axiom/lang/api/IdentifierSpaceKey.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/api/stmt/AxiomStatement.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/api/stmt/AxiomStatementStreamListener.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/api/stmt/SourceLocation.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AbstractAxiomBaseDefinition.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AbstractContext.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomAntlrVisitor.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomErrorListener.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomIdentifierResolver.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomItemContext.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomItemDefinitionImpl.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomModelInfo.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomRootContext.java
M infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomSchemaContextImpl.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomSemanticException.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomStatementBuilder.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomStatementFactoryContext.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomStatementImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomStatementRule.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomStatementSource.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomStatementStreamBuilder.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomSyntaxException.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomTypeDefinitionImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomValueContext.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomValueReference.java
M infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/BasicStatementRule.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/CompositeIdentifierSpace.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/DefaultItemDefinition.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/DefaultTypeDefinition.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/Deffered.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/DelegatedRequirement.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/IdentifierSpaceHolder.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/IdentifierSpaceHolderImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/ItemContext.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/LazyValue.java
M infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/ModelReactorContext.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/NamespaceContext.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/Requirement.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/RuleContextImpl.java
M infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/RuleErrorMessage.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/SourceContext.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementContext.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementContextImpl.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementContextResult.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementRule.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementRuleContext.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementRuleContextImpl.java
R infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementTreeBuilder.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/ValueActionImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/ValueContext.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/spi/AbstractBaseDefinition.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/spi/AxiomIdentifierDefinitionImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/spi/AxiomItemDefinitionImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/spi/AxiomItemStreamTreeBuilder.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/spi/AxiomNameResolver.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/spi/AxiomSemanticException.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/spi/AxiomSyntaxException.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/spi/AxiomTypeDefinitionImpl.java
A infra/axiom/src/main/java/com/evolveum/axiom/reactor/AbstractDependency.java
A infra/axiom/src/main/java/com/evolveum/axiom/reactor/Action.java
A infra/axiom/src/main/java/com/evolveum/axiom/reactor/ActionState.java
A infra/axiom/src/main/java/com/evolveum/axiom/reactor/BaseReactorContext.java
A infra/axiom/src/main/java/com/evolveum/axiom/reactor/Deffered.java
A infra/axiom/src/main/java/com/evolveum/axiom/reactor/DelegatedDependency.java
A infra/axiom/src/main/java/com/evolveum/axiom/reactor/DependantAction.java
A infra/axiom/src/main/java/com/evolveum/axiom/reactor/Dependency.java
A infra/axiom/src/main/java/com/evolveum/axiom/reactor/FlatMapDependency.java
A infra/axiom/src/main/java/com/evolveum/axiom/reactor/MapDependency.java
A infra/axiom/src/main/java/com/evolveum/axiom/reactor/RetriableDependency.java
A infra/axiom/src/main/java/com/evolveum/axiom/reactor/Rule.java
A infra/axiom/src/main/java/com/evolveum/axiom/reactor/RuleReactorContext.java
A infra/axiom/src/main/resources/axiom-base-types.axiom
R infra/axiom/src/main/resources/axiom-lang.axiom
A infra/axiom/src/main/resources/axiom-model.axiom
A infra/axiom/src/test/java/com/evolveum/axiom/lang/test/AbstractReactorTest.java
A infra/axiom/src/test/java/com/evolveum/axiom/lang/test/TestAxiomExtension.java
A infra/axiom/src/test/java/com/evolveum/axiom/lang/test/TestAxiomInfra.java
A infra/axiom/src/test/java/com/evolveum/axiom/lang/test/TestAxiomMultimodule.java
M infra/axiom/src/test/java/com/evolveum/axiom/lang/test/TestAxiomParser.java
A infra/axiom/src/test/java/com/evolveum/axiom/lang/test/TestAxiomPrism.java
A infra/axiom/src/test/java/com/evolveum/axiom/lang/test/TestTypeDerivation.java
R infra/axiom/src/test/resources/axiom-base-types.axiom
A infra/axiom/src/test/resources/axiom-data.axiom
M infra/axiom/src/test/resources/base-example.axiom
R infra/axiom/src/test/resources/common-core.axiom
A infra/axiom/src/test/resources/multimodel/derived/base-person.axiom
A infra/axiom/src/test/resources/multimodel/derived/derived-person.axiom
A infra/axiom/src/test/resources/multimodel/derived/john-doe.axiomd
A infra/axiom/src/test/resources/multimodel/extension/declaration-order.axiom
A infra/axiom/src/test/resources/multimodel/extension/language-extension-use.axiom
A infra/axiom/src/test/resources/multimodel/extension/language-extension.axiom
A infra/axiom/src/test/resources/multimodel/extension/person-extension.axiom
A infra/axiom/src/test/resources/multimodel/extension/test-person.axiom
A infra/axiom/src/test/resources/multimodel/ref/foaf-person.axiom
A infra/axiom/src/test/resources/multimodel/ref/schema-org-person.axiom
A infra/axiom/src/test/resources/multimodel/ref/test-person.axiom
A infra/axiom/src/test/resources/multimodel/ref/test-person.axiom.invalid
A infra/axiom/src/test/resources/prism/common-core.axiom
A infra/axiom/src/test/resources/prism/common-core.prism
A infra/axiom/src/test/resources/prism/prism-infra.axiom
A infra/axiom/src/test/resources/prism/prism.axiom
M infra/axiom/src/test/resources/scripting.axiom
Log Message:
-----------
Merge branch 'feature/axiom' into feature/metadata-mappings
Commit: 7fa7a08c6bb67322e13c26c723036542016534e9
https://github.com/Evolveum/midpoint/commit/7fa7a08c6bb67322e13c26c723036542016534e9
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-06-12 (Fri, 12 Jun 2020)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerValuePanel.java
M infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomValueFactory.java
Log Message:
-----------
Fix compilation on Java 8
Commit: 88747f7cff1ed4f5ed65922d4a5864f328501588
https://github.com/Evolveum/midpoint/commit/88747f7cff1ed4f5ed65922d4a5864f328501588
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-06-16 (Tue, 16 Jun 2020)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-metadata-3.xsd
Log Message:
-----------
Add draft metadata handling schema
It allows to specify metadata mappings and/or select such mappings
from a system-wide, object- or archetype-specific mapping pool.
Related to MID-6275.
Commit: 079720955eaafe9699145d4b1114f64004aa8173
https://github.com/Evolveum/midpoint/commit/079720955eaafe9699145d4b1114f64004aa8173
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-06-16 (Tue, 16 Jun 2020)
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/PrismValue.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ValueMetadata.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/metadata/ValueMetadataFactory.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/metadata/ValueMetadataMockUpFactory.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/metadata/ValueMetadataAdapter.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/metadata/MidpointValueMetadataFactory.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
A model/model-intest/src/test/resources/schema/metadata.xsd
Log Message:
-----------
Add "real" value metadata into PrismValueImpl
Related to MID-6275.
Commit: 1a4ec87d5eada530b7c445b9f26021d11f91cc85
https://github.com/Evolveum/midpoint/commit/1a4ec87d5eada530b7c445b9f26021d11f91cc85
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-06-17 (Wed, 17 Jun 2020)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismValue.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/metadata/ValueMetadataAdapter.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
A model/model-intest/src/test/resources/metadata/system-configuration.xml
A model/model-intest/src/test/resources/metadata/template-regular-user.xml
A model/model-intest/src/test/resources/metadata/user-bob.xml
M model/model-intest/src/test/resources/schema/metadata.xsd
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ExtensionAsserter.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/UserAsserter.java
A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ValueMetadataAsserter.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismContainerValueAsserter.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismObjectAsserter.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismValueAsserter.java
Log Message:
-----------
Add first test for metadata mapping
(Mapping is not implemented yet.)
Related to MID-6275.
Commit: 2ba3bfe396e1a99177329ea103a1f8b2f7c88368
https://github.com/Evolveum/midpoint/commit/2ba3bfe396e1a99177329ea103a1f8b2f7c88368
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-06-18 (Thu, 18 Jun 2020)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Item.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/PrismValue.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/ItemDeltaItem.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/PrismObjectImpl.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/item/DummyItem.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/metadata/ValueMetadataAdapter.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/metadata/MidpointValueMetadataFactory.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/traces/OpType.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/traces/visualizer/MappingEvaluationVisualizer.java
M infra/schema/src/main/resources/xml/ns/public/common/common-metadata-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/transformation/ValueTupleTransformation.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingBuilder.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingImpl.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingBuilder.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingFactory.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingParser.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingBuilder.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingEvaluator.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingImpl.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/SimpleValueMetadataComputer.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/TimeConstraintsEvaluation.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/ValueMetadataComputation.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ValueMatcher.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java
M model/model-impl/src/main/resources/ctx-model.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionEvaluationContext.java
A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ValueMetadataComputer.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelayedEnable.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/grouper/AbstractGrouperTest.java
Log Message:
-----------
Add limited metadata mapping functionality
1. Created AbstractMappingImpl (= MappingImpl + MetadataMappingImpl)
2. The same for AbstractMappingBuilder
3. Adapted the rest of code to this change
4. Hacked IvwoConsolidator and other components to preserve
value metadata
Related to MID-6275.
Commit: cc5e5881ad4bfabb083ad03c4494e6daa324332a
https://github.com/Evolveum/midpoint/commit/cc5e5881ad4bfabb083ad03c4494e6daa324332a
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-06-18 (Thu, 18 Jun 2020)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Item.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/PrismValue.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ValueMetadata.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/metadata/ValueMetadataFactory.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/metadata/ValueMetadataMockUpFactory.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/ItemDeltaItem.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/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/PrismValueImpl.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/metadata/ValueMetadataAdapter.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/metadata/MidpointValueMetadataFactory.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/traces/OpType.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/traces/visualizer/MappingEvaluationVisualizer.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-metadata-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/transformation/ValueTupleTransformation.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingBuilder.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingImpl.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingBuilder.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingFactory.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingParser.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingBuilder.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingEvaluator.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingImpl.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/SimpleValueMetadataComputer.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/TimeConstraintsEvaluation.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/ValueMetadataComputation.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ValueMatcher.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java
M model/model-impl/src/main/resources/ctx-model.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
A model/model-intest/src/test/resources/metadata/system-configuration.xml
A model/model-intest/src/test/resources/metadata/template-regular-user.xml
A model/model-intest/src/test/resources/metadata/user-bob.xml
A model/model-intest/src/test/resources/schema/metadata.xsd
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionEvaluationContext.java
A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ValueMetadataComputer.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ExtensionAsserter.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/UserAsserter.java
A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ValueMetadataAsserter.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismContainerValueAsserter.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismObjectAsserter.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismValueAsserter.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelayedEnable.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/grouper/AbstractGrouperTest.java
Log Message:
-----------
Merge branch 'feature/metadata-mappings'
# Conflicts:
# infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
Commit: 68f30a91839a1768193de980fba152b349ac11d6
https://github.com/Evolveum/midpoint/commit/68f30a91839a1768193de980fba152b349ac11d6
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-06-18 (Thu, 18 Jun 2020)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
Log Message:
-----------
Fix merge conflicts
Compare: https://github.com/Evolveum/midpoint/compare/ad7f46a134c3...68f30a91839a
More information about the midPoint-svn
mailing list