[midPoint-git] [Evolveum/midpoint] 0c012f: adding support of virtual containers in vertical f...
Lukas Skublik
noreply at github.com
Thu Aug 18 17:08:08 CEST 2022
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 0c012f72828276707ed05723ba01dc853e06fb1a
https://github.com/Evolveum/midpoint/commit/0c012f72828276707ed05723ba01dc853e06fb1a
Author: lskublik <lskublik at evolveum.com>
Date: 2022-08-18 (Thu, 18 Aug 2022)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/factory/wrapper/WrapperContext.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/prism/wrapper/PrismContainerWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebPrismUtil.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/page/admin/ObjectDetailsModels.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/ResourceDetailsModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/AbstractResourceWizardPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/AbstractValueFormResourceWizardStepPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/AbstractValueFormResourceWizardStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/basic/AbstractConfigurationStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/basic/AbstractFormResourceWizardStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/basic/BasicSettingStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/basic/CreateResourceTemplatePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/basic/DiscoveryStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/basic/PartialConfigurationStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/basic/SelectObjectClassesStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/objectType/BasicSettingResourceObjectTypeStepPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/objectType/DelineationResourceObjectTypeStepPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/objectType/FocusResourceObjectTypeStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/objectType/ResourceObjectTypeWizardPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/objectType/attributeMapping/AttributeInboundStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/objectType/attributeMapping/AttributeOutboundStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/objectType/attributeMapping/BasicSettingStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/objectType/attributeMapping/LimitationsStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/objectType/credentials/PasswordInboundStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/objectType/credentials/PasswordOutboundStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/objectType/synchronization/DefaultSettingStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/objectType/synchronization/ReactionStepPanel.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/PrismContainerValuePanel.java
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/SingleContainerPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormContainerHeaderPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormContainerHeaderPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormDefaultContainerablePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormDefaultContainerablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPrismContainerPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPrismContainerValuePanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPrismContainerValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPrismPropertyHeaderPanel.html
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/web/model/ItemWrapperModel.java
M gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/AdminGuiConfigurationMergeManager.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AdminGuiConfigurationMergeManagerImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/GuiProfileCompiler.java
Log Message:
-----------
adding support of virtual containers in vertical form and adding configuration of virtual containers for resource object type
Commit: a31af7a59177f03ec924811df6836f7b50f9706d
https://github.com/Evolveum/midpoint/commit/a31af7a59177f03ec924811df6836f7b50f9706d
Author: lskublik <lskublik at evolveum.com>
Date: 2022-08-18 (Thu, 18 Aug 2022)
Changed paths:
M gui/admin-gui/src/frontend/scss/_tiles.scss
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/PredefinedDashboardWidgetId.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/SubscriptionType.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageAdminLTE.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/PageTypes.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/table/WidgetTableHeader.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/CatalogTile.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/CatalogTilePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/CatalogTilePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/FocusDetailsModels.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/AbstractAssignmentTypePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/AbstractRoleAssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusCasesPanel.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/org/PageOrgHistory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRoleHistory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageServiceHistory.java
M 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/gui/impl/page/admin/user/UserDetailsModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/PageUserSelfProfile.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/DashboardLinkComponent.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/DashboardLinkComponent.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/DashboardSearchPanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/DashboardSearchPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/PageSelfDashboard.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/PageSelfDashboard.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/component/DashboardLinkComponent.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/component/DashboardLinkComponent.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/component/DashboardSearchPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/component/DashboardSearchPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/component/MyAccessesPreviewDataPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/component/StatisticDashboardWidget.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/component/StatisticDashboardWidget.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/Conflict.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictItemPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictSolverPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/PersonOfInterestPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RequestAccess.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ResourceAttributeWrapperImpl.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItems.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/PageOrgs.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/CasesTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageXmlDataReview.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
M gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml
M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
M gui/admin-gui/src/main/resources/initial-objects/043-role-delegator.xml
M infra/schema/pom.xml
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/correlator/CorrelatorMergeOperation.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SynchronizationPolicyFactory.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/deleg/AttributeDefinitionDelegator.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/deleg/RefinedAttributeDefinitionDelegator.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CorrelationAlgorithm.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CorrelationItemDefinitionUtil.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SubscriptionUtil.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-correlation-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-gui-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-metadata-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestAxiomQueryLanguage.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConverter.java
M infra/schema/src/test/resources/queryconverter/filter-by-type.xml
M infra/schema/src/test/resources/queryconverter/filter-user-by-name.xml
M model/authentication-impl/src/main/java/com/evolveum/midpoint/authentication/impl/util/EndPointsUrlMapping.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/CompiledGuiProfile.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlation/CorrelationCaseDescription.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlation/CorrelationService.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlation/TemplateCorrelationConfiguration.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CorrelationExplanation.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CorrelationResult.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CorrelatorContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AdminGuiConfigurationMergeManagerImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/CorrelationCaseDescriber.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/correlation/CorrelationServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/CorrelatorContextCreator.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/TemplateCorrelationConfigurationImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/BaseCorrelator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/expression/ExpressionCorrelator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/filter/FilterCorrelator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/idmatch/IdMatchCorrelator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/idmatch/IdMatchObjectCreator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/items/CorrelationItem.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/items/CorrelationItems.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/items/ItemsCorrelator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/identities/IndexingConfigurationImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/identities/IndexingItemConfigurationImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/identities/NormalizationImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/identities/NormalizationStep.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/inbounds/SimplePreInboundsContextImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/inbounds/prep/MappedItems.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/GuiProfileCompiler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationProcessing.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/correlator/correlation/TestCandidateOwner.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/correlator/correlation/TestCorrelators.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/correlator/correlation/TestExpressionCorrelator.java
M model/model-impl/src/test/resources/common/resource-dummy.xml
M model/model-impl/src/test/resources/correlator/correlation/accounts-by-name-default.csv
A model/model-impl/src/test/resources/correlator/correlation/accounts-by-name-fuzzy-gradual.csv
M model/model-impl/src/test/resources/correlator/correlation/accounts-by-name-original.csv
M model/model-impl/src/test/resources/correlator/correlation/accounts-complex.csv
M model/model-impl/src/test/resources/correlator/correlation/accounts-id-match.csv
M model/model-impl/src/test/resources/correlator/correlation/correlator-by-name-default.xml
A model/model-impl/src/test/resources/correlator/correlation/correlator-by-name-fuzzy-gradual.xml
M model/model-impl/src/test/resources/correlator/correlation/correlator-by-name-fuzzy.xml
M model/model-impl/src/test/resources/correlator/correlation/correlator-by-name-original.xml
M model/model-impl/src/test/resources/correlator/correlation/correlator-complex.xml
M model/model-impl/src/test/resources/correlator/correlation/correlator-id-match.xml
M model/model-impl/src/test/resources/correlator/correlation/user-template-complex.xml
M model/model-intest/src/test/resources/archetypes/resource-dummy-lab.xml
M model/model-intest/src/test/resources/archetypes/resource-dummy-source.xml
M model/model-intest/src/test/resources/identities/resource-multi.xml
M model/model-intest/src/test/resources/identities/resource-single.xml
M model/model-intest/src/test/resources/mapping/resource-target-photos.xml
M model/model-intest/src/test/resources/sync/resource-dummy-archetyped.xml
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/resources/TestResourceTemplateMerge.java
M provisioning/provisioning-impl/src/test/resources/merge/resource-object-types-1.xml
M provisioning/provisioning-impl/src/test/resources/merge/resource-object-types-template.xml
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleQueryContext.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/filtering/ExtensionItemFilterProcessor.java
M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/SqaleRepoBaseTest.java
M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoIdentityDataTest.java
M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSearchTest.java
M repo/repo-sql-impl-test/src/test/resources/query/query-user-by-name.xml
M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/item/ItemValueFilterProcessor.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/correlation/AbstractCorrelationTest.java
M testing/story/src/test/resources/correlation/idmatch/medium/resource-external.xml
M testing/story/src/test/resources/correlation/idmatch/medium/resource-hr.xml
M testing/story/src/test/resources/correlation/idmatch/medium/resource-sis.xml
M testing/story/src/test/resources/correlation/internal/medium/object-template-user.xml
M testing/story/src/test/resources/correlation/internal/multi-accounts/020-object-template-user.xml
M testing/story/src/test/resources/correlation/internal/simple/resource-target-simplified.xml
M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master'
Compare: https://github.com/Evolveum/midpoint/compare/d65f4d10941a...a31af7a59177
More information about the midPoint-svn
mailing list