[midPoint-git] [Evolveum/midpoint] 18fa2a: supprt for multivalue containers
Katarina Valalikova
k.valalikova at evolveum.com
Wed Sep 20 15:15:04 CEST 2017
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 18fa2adc0ba74ba1eb922a33f9ffae4bb2cb0bfd
https://github.com/Evolveum/midpoint/commit/18fa2adc0ba74ba1eb922a33f9ffae4bb2cb0bfd
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)
Changed paths:
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/web/component/assignment/PolicyRuleConstraintsExpandablePanel.java
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/prism/AssociationWrapper.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValuePanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValuePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ReferenceWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java
Log Message:
-----------
supprt for multivalue containers
Commit: d41bda6d915e2535bb9c26cfcd462e4cf176ea42
https://github.com/Evolveum/midpoint/commit/d41bda6d915e2535bb9c26cfcd462e4cf176ea42
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-09-15 (Fri, 15 Sep 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusDetailsTabPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusDetailsTabPanel.java
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/prism/AssociationWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerHeaderPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerHeaderPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismOptionButtonPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ReferenceWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ContainerWrapperFromObjectWrapperModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/PropertyWrapperFromObjectWrapperModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/dto/GenericHandlerDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssociationValueChoicePanel.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestUnitObjectWrapperFactory.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/WrapperTestUtil.java
Log Message:
-----------
mutlivalue containers improvements - work in progress
Commit: 5fbe1d55088495fc2e096fda92979b4ff9414fae
https://github.com/Evolveum/midpoint/commit/5fbe1d55088495fc2e096fda92979b4ff9414fae
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
Changed paths:
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/web/component/assignment/AbstractAssignmentDetailsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleConstraintsExpandablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusDetailsTabPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusDetailsTabPanel.java
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/prism/ContainerValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemVisibilityHandler.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerHeaderPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismOptionButtonPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ContainerValueWrapperFromObjectWrapperModel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ContainerWrapperListFromObjectWrapperModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/GenericHandlerPanel.java
Log Message:
-----------
mutlivalue container, small prism wrappers cleanup
Commit: 600863b54c294243fa9afad8ff045fe29c8f9b0d
https://github.com/Evolveum/midpoint/commit/600863b54c294243fa9afad8ff045fe29c8f9b0d
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OpResult.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
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/util/WebComponentUtil.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GridViewComponent.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GridViewComponent.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleUtil.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/ObjectHistoryTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RoleMainPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ListDataProvider.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/LocalizableMessageModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessesPreviewPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessesPreviewPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/FileAppenderConfig.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
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/PageAdminRoles.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/dto/GenericHandlerDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ServiceMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageAdminValuePolicies.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicies.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicies.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/EvaluatedTriggerGroupListPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/EvaluatedTriggerGroupListPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/EvaluatedTriggerGroupPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/EvaluatedTriggerGroupPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/EvaluatedTriggerPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/EvaluatedTriggerPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/AlreadyShownTriggerRecord.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalProcessExecutionInformationDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/EvaluatedTriggerDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/EvaluatedTriggerGroupDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/AssignmentViewType.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/ShoppingCartConfigurationDto.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/RoleCatalogStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointStringResourceLoader.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/Utf8BundleStringResourceLoader.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
A infra/common/fake-midpoint-home/localization/Midpoint_sk.properties
A infra/common/fake-midpoint-home/localization/schema_sk.properties
M infra/common/pom.xml
A infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationService.java
A infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationServiceImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
M infra/common/src/main/resources/ctx-common.xml
A infra/common/src/test/java/com/evolveum/midpoint/common/LocalizationTest.java
A infra/common/src/test/resources/localization/Midpoint_sk.properties
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_ItemEntry.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchemaImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismPrettyPrinter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/LocalizationUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
M infra/schema/src/main/resources/localization/schema.properties
M infra/schema/src/main/resources/localization/schema_cs.properties
M infra/schema/src/main/resources/localization/schema_de.properties
M infra/schema/src/main/resources/localization/schema_en.properties
M infra/schema/src/main/resources/localization/schema_es.properties
M infra/schema/src/main/resources/localization/schema_et.properties
M infra/schema/src/main/resources/localization/schema_fi.properties
M infra/schema/src/main/resources/localization/schema_hu.properties
M infra/schema/src/main/resources/localization/schema_pl.properties
M infra/schema/src/main/resources/localization/schema_pt_BR.properties
M infra/schema/src/main/resources/localization/schema_ru.properties
M infra/schema/src/main/resources/localization/schema_sk.properties
M infra/schema/src/main/resources/localization/schema_tr.properties
M infra/schema/src/main/resources/localization/schema_zh_CN.properties
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-model-context-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseResource.java
M infra/schema/src/test/resources/common/json/no-ns/resource-expression.json
M infra/schema/src/test/resources/common/json/ns/resource-expression.json
M infra/schema/src/test/resources/common/xml/no-ns/resource-expression.xml
M infra/schema/src/test/resources/common/xml/ns/resource-expression.xml
M infra/schema/src/test/resources/common/yaml/no-ns/resource-expression.yaml
M infra/schema/src/test/resources/common/yaml/ns/resource-expression.yaml
M infra/util/pom.xml
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/LocalizableMessage.java
M infra/util/src/main/java/com/evolveum/midpoint/util/LocalizableMessageBuilder.java
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
A infra/util/src/main/java/com/evolveum/midpoint/util/TreeNode.java
M infra/util/src/main/java/com/evolveum/midpoint/util/exception/CommonException.java
M infra/util/src/main/java/com/evolveum/midpoint/util/exception/ObjectNotFoundException.java
M infra/util/src/main/java/com/evolveum/midpoint/util/exception/PolicyViolationException.java
M model/certification-impl/pom.xml
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/CertificationHook.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
A model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractUninitializedCertificationTest.java
A model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/complex/TestPolicyDrivenRoleLifecycle.java
A model/certification-impl/src/test/resources/common/user-administrator-plain.xml
A model/certification-impl/src/test/resources/complex/messages.properties
A model/certification-impl/src/test/resources/complex/role-correct-high-risk.xml
A model/certification-impl/src/test/resources/complex/role-correct.xml
A model/certification-impl/src/test/resources/complex/role-empty.xml
A model/certification-impl/src/test/resources/complex/role-high-risk-empty.xml
A model/certification-impl/src/test/resources/complex/system-configuration.xml
A model/certification-impl/src/test/resources/complex/user-jack.xml
A model/certification-impl/src/test/resources/ctx-certification-test-with-workflows.xml
M model/certification-impl/testng-integration.xml
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/PipelineItem.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedCompositeTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedHasAssignmentTrigger.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedModificationTrigger.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedMultiplicityTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedSituationTrigger.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedStateTrigger.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedTimeValidityTrigger.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedTransitionTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PredefinedPolicySituation.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.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/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/SimpleOperationName.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/AssignmentPolicyRuleEvaluationContext.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/ObjectPolicyRuleEvaluationContext.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/ObjectState.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleEvaluationContext.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleProcessor.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicySituationUpdater.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/AssignmentConstraintEvaluator.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/CompositeConstraintEvaluator.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ConstraintEvaluatorHelper.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ExclusionConstraintEvaluator.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/HasAssignmentConstraintEvaluator.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ModificationConstraintEvaluator.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/MultiplicityConstraintEvaluator.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/PolicyConstraintEvaluator.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/PolicySituationConstraintEvaluator.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/StateConstraintEvaluator.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/TransitionConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ExecutionContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/PipelineData.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DiscoverConnectorsExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/PurgeSchemaExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SearchEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SelectEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyMetadata.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules2.java
A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/RecordingProgressListener.java
M model/model-impl/src/test/resources/common/system-configuration.xml
A model/model-impl/src/test/resources/lens/policy/role-ambiguous-reference.xml
A model/model-impl/src/test/resources/lens/policy/role-chained-references.xml
A model/model-impl/src/test/resources/lens/policy/role-cyclic-references.xml
A model/model-impl/src/test/resources/lens/policy/role-person.xml
A model/model-impl/src/test/resources/lens/policy/role-student.xml
A model/model-impl/src/test/resources/lens/policy/role-temporary.xml
A model/model-impl/src/test/resources/lens/policy/role-unresolvable-references.xml
A model/model-impl/src/test/resources/lens/policy/user-frank.xml
A model/model-impl/src/test/resources/lens/policy/user-joe.xml
A model/model-impl/src/test/resources/lens/policy/user-peter.xml
M model/model-impl/src/test/resources/lens/role-judge.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/DelayingProgressListener.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/AbstractRbacTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/DelayingProgressListener.java
R model/model-intest/src/test/resources/common/account-herman-opendj.xml
R model/model-intest/src/test/resources/common/resource-opendj.xml
M model/model-intest/src/test/resources/common/system-configuration.xml
M model/model-intest/src/test/resources/rbac/role-cannibal-deprecated.xml
M model/model-intest/src/test/resources/rbac/role-cannibal.xml
A model/model-intest/src/test/resources/rbac/role-createable.xml
A model/model-intest/src/test/resources/scripting/search-for-users-with-expressions.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
R model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java
A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationHook.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AccountActivationNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/TimeValidityNotifier.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/ApprovalSchemaExecutionInformationHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/AdditionalInformationGenerator.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareForTaskCreation.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/object/TestObjectConstraints.java
A model/workflow-impl/src/test/resources/policy/object/metarole-constraints.xml
A model/workflow-impl/src/test/resources/policy/object/role-employee.xml
A model/workflow-impl/src/test/resources/policy/object/system-configuration.xml
A model/workflow-impl/src/test/resources/policy/object/user-employee-owner.xml
M model/workflow-impl/src/test/resources/policy/sod/metarole-criminal-exclusion.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java
M provisioning/provisioning-impl/src/test/resources/dummy/dummy-parallelism/resource-dummy.xml
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/PrismIdentifierGenerator.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M repo/repo-test-util/src/main/resources/test-config.xml
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_oracle.sql
M samples/certification/sod/a-test-2a.xml
M samples/certification/sod/a-test-2b.xml
M samples/certification/sod/a-test-2c.xml
A samples/resources/ldap/evo-test-1-mod.ldif
A samples/resources/ldap/evo-test-1.ldif
A samples/resources/ldap/evo-test-1.schema
A samples/resources/ldap/midpoint-schema-example-mod.ldif
A samples/resources/ldap/midpoint.schema
M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java
M testing/longtest/src/test/resources/common/resource-opendj.xml
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/multivalue-containers
Conflicts:
gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.java
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
Commit: 317e0137a763d647c06745e7d1f86d6e99dca2f8
https://github.com/Evolveum/midpoint/commit/317e0137a763d647c06745e7d1f86d6e99dca2f8
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-09-20 (Wed, 20 Sep 2017)
Changed paths:
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/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/UserSelectionButton.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/UserSelectionButton.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicies.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicies.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicy.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicy.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/component/ValuePolicyBasicPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/component/ValuePolicyBasicPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/component/ValuePolicyDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/component/ValuePolicySummaryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/ShoppingCartConfigurationDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M model/model-impl/src/test/resources/common/system-configuration.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/multivalue-containers
Commit: 534126725c39ad7dcf5f8c0c027cd6c439d3298b
https://github.com/Evolveum/midpoint/commit/534126725c39ad7dcf5f8c0c027cd6c439d3298b
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-09-20 (Wed, 20 Sep 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ContainerWrapperListFromObjectWrapperModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java
Log Message:
-----------
some restrictions for policy contraints and samll improvements
Commit: 0160d52e7c19b8dcb2b09ec5df536ac9cd00f3d8
https://github.com/Evolveum/midpoint/commit/0160d52e7c19b8dcb2b09ec5df536ac9cd00f3d8
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-09-20 (Wed, 20 Sep 2017)
Changed paths:
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismOptionButtonPanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismOptionButtonPanel.java
Log Message:
-----------
deleting old unused panels.
Commit: 0c65e7bb7bb434d009386ba331706ca6c8565a16
https://github.com/Evolveum/midpoint/commit/0c65e7bb7bb434d009386ba331706ca6c8565a16
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-09-20 (Wed, 20 Sep 2017)
Changed paths:
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/web/component/assignment/AbstractAssignmentDetailsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleConstraintsExpandablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusDetailsTabPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusDetailsTabPanel.java
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/prism/AssociationWrapper.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValuePanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValuePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemVisibilityHandler.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerHeaderPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerHeaderPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismOptionButtonPanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismOptionButtonPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ReferenceWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ContainerValueWrapperFromObjectWrapperModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ContainerWrapperFromObjectWrapperModel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ContainerWrapperListFromObjectWrapperModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/PropertyWrapperFromObjectWrapperModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/GenericHandlerPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/dto/GenericHandlerDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssociationValueChoicePanel.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestUnitObjectWrapperFactory.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/WrapperTestUtil.java
Log Message:
-----------
Merge remote-tracking branch 'origin/feature/multivalue-containers'
Commit: 4ee51934c4a04ace0535eb42472c53155678f9d1
https://github.com/Evolveum/midpoint/commit/4ee51934c4a04ace0535eb42472c53155678f9d1
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-09-20 (Wed, 20 Sep 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
Log Message:
-----------
small fixes after merge
Commit: fc05a74c7ef7832b86b5563aa9b3a1bfb71f79d4
https://github.com/Evolveum/midpoint/commit/fc05a74c7ef7832b86b5563aa9b3a1bfb71f79d4
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-09-20 (Wed, 20 Sep 2017)
Changed paths:
M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Compare: https://github.com/Evolveum/midpoint/compare/8fe0a5d64bc9...fc05a74c7ef7
More information about the midPoint-svn
mailing list