[midPoint-git] [Evolveum/midpoint] 83f9d0: inbound for associations

Katarina Valalikova k.valalikova at evolveum.com
Thu Nov 9 13:08:32 CET 2017


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 83f9d0499d375a285de4b311565cef7e21bcb0da
      https://github.com/Evolveum/midpoint/commit/83f9d0499d375a285de4b311565cef7e21bcb0da
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-07 (Tue, 07 Nov 2017)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.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/RefinedAssociationDefinition.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/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PrismValueDeltaSetTriple.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.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/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingAutoInbound.java
    A model/model-intest/src/test/resources/common/role-admins.xml
    A model/model-intest/src/test/resources/common/role-autotesters.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-autogreen.xml
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionEvaluationContext.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionVariables.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/VariableProducer.java

  Log Message:
  -----------
  inbound for associations


  Commit: 364b10f1d5f9e1c46c17095d72ef0e5fcb1b4f35
      https://github.com/Evolveum/midpoint/commit/364b10f1d5f9e1c46c17095d72ef0e5fcb1b4f35
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-08 (Wed, 08 Nov 2017)

  Changed paths:
    M build-system/pom.xml
    M config/initial-objects/020-system-configuration.xml
    M config/sql/_all/h2-3.7-all.sql
    M config/sql/_all/mysql-3.7-all.sql
    M config/sql/_all/mysql-upgrade-3.6-3.7.sql
    M config/sql/_all/oracle-3.7-all.sql
    M config/sql/_all/postgresql-3.7-all.sql
    M config/sql/_all/sqlserver-3.7-all.sql
    M config/sql/midpoint/3.7/h2/h2-upgrade-3.6-3.7.sql
    M config/sql/midpoint/3.7/mysql/mysql-upgrade-3.6-3.7.sql
    M config/sql/midpoint/3.7/oracle/oracle-upgrade-3.6-3.7.sql
    M config/sql/midpoint/3.7/postgresql/postgresql-upgrade-3.6-3.7.sql
    M config/sql/midpoint/3.7/sqlserver/sqlserver-upgrade-3.6-3.7.sql
    M dist/src/main/assembly/dist.xml
    A dist/src/main/bin/start.bat
    A dist/src/main/bin/start.sh
    A dist/src/main/bin/stop.sh
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.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/ModelServiceLocator.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/web/boot/CasSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/LdapSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/Wro4jConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectSummaryPanel.java
    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
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.html
    M 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.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.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/objectdetails/AbstractObjectMainPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleInducementPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleInducementPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.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/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.html
    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/show/PagePreviewChanges.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.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/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ImportOptionsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ImportOptionsPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AccountDetailsSearchDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    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/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/PageUser.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/PageUsers.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsAll.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsAllocatedToMe.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsAttorney.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsClaimable.java
    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/WorkItemsPageType.java
    M 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/WorkItemDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    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/PageSelfDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ConfigurationStorage.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/InducementsTabStorage.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/MidPointUrlLocatorFactory.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/PropertyUrlUriLocator.java
    R gui/admin-gui/src/main/resources/META-INF/atmosphere.xml
    A gui/admin-gui/src/main/resources/application-cas.yml
    A gui/admin-gui/src/main/resources/application-ldap.yml
    M gui/admin-gui/src/main/resources/application.yml
    R gui/admin-gui/src/main/resources/ctx-web-security-basic.xml
    M gui/admin-gui/src/main/resources/ctx-web-security-cas.xml
    R gui/admin-gui/src/main/resources/ctx-web-security-ldap.xml
    R gui/admin-gui/src/main/resources/ctx-web-security.xml
    M gui/admin-gui/src/main/resources/ctx-webapp.xml
    M gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml
    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/resources/logback.xml
    R gui/admin-gui/src/main/resources/midpoint-config.properties
    M gui/admin-gui/src/main/resources/static/js/midpoint/ace-editor.js
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M gui/admin-gui/src/main/resources/wro.xml
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiIntegrationTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiUnitTest.java
    A infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationMessageSource.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationServiceImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
    M infra/common/src/main/resources/ctx-common.xml
    M infra/common/src/test/java/com/evolveum/midpoint/common/LocalizationTest.java
    M infra/common/src/test/resources/localization/Midpoint_sk.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/DefaultReferencableImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Referencable.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.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/util/AdminGuiConfigTypeUtil.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/ObjectTypeUtil.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_en.properties
    M infra/schema/src/main/resources/localization/schema_tr.properties
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    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-policy-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/ClassPathUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/exception/PolicyViolationException.java
    M model/certification-api/src/main/java/com/evolveum/midpoint/certification/api/OutcomeUtils.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationCampaignCreationTaskHandler.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationClosingTaskHandler.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationRemediationTaskHandler.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/CertificationManagerImpl.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCertificationBasic.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCriticalRolesCertification.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestRoleInducementCertification.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestSoDCertification.java
    M model/certification-impl/src/test/resources/logback-test.xml
    M model/model-api/pom.xml
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuditRecorder.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/MidPointLdapAuthenticationProvider.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelProjectionContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/EvaluatedPolicyRuleUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/CustomFunctions.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/PrismValueDeltaSetTripleProducer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanUpTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AuditController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelDiagController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.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/expr/MidpointFunctionsImpl.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/importer/ImportObjectsFromFileTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.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/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.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/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/OperationalDataManager.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/PersonaProcessor.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusConstraintsChecker.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.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/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/CredentialPolicyEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentTripleEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocalMappingSpec.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusConstraintsChecker.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/AssignmentModificationConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ConstraintEvaluatorHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ExclusionConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/HasAssignmentConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/MultiplicityConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ObjectModificationConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptExecutionTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidPointLdapAuthenticationProvider.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/NonceAuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/PasswordAuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityQuestionAuthneticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationInjectorInterceptor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AuditReindexTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DeleteTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/ReindexTaskHandler.java
    A model/model-impl/src/main/resources/com/evolveum/midpoint/security.properties
    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/TestProjector.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestInbounds.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/AbstractImportTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMapping.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAutoassign.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestMetaMeta.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/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/MockTaskHandler.java
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/common/user-template-inbounds.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/mapping/role-antinihilist.xml
    A model/model-intest/src/test/resources/rbac/autoassign/role-unit-sleeper.xml
    A model/model-intest/src/test/resources/rbac/autoassign/role-unit-walker.xml
    A model/model-intest/src/test/resources/rbac/autoassign/role-unit-worker.xml
    A model/model-intest/src/test/resources/rbac/metameta/role-meta-greek-group.xml
    A model/model-intest/src/test/resources/rbac/metameta/role-meta-latin-group.xml
    A model/model-intest/src/test/resources/rbac/metameta/role-meta-legacy-one.xml
    A model/model-intest/src/test/resources/rbac/metameta/role-meta-meta-legacy.xml
    A model/model-intest/src/test/resources/rbac/metameta/role-meta-meta-world.xml
    M model/model-intest/src/test/resources/rbac/role-meta-fool.xml
    A model/model-intest/src/test/resources/security/role-approver.xml
    A model/model-intest/src/test/resources/security/role-assign-self-requestable-any-approver.xml
    A model/model-intest/src/test/resources/security/role-attorney-caribbean-unlimited.xml
    A model/model-intest/src/test/resources/security/role-attorney-manager-workitems.xml
    M model/model-intest/testng-integration.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/TaskEvent.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/ApprovalMetadataHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareChildOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareRootOperationTaskHandler.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/AssignmentPolicyAspectPart.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ObjectPolicyAspectPart.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ProcessSpecifications.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestUserChangeApprovalLegacy.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/ApprovalInstruction.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/AbstractTestLifecycle.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/global/TestLifecycleGlobal.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/object/TestObjectConstraints.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestActivitiQuery.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/sod/AbstractTestSoD.java
    M model/workflow-impl/src/test/resources/policy/object/metarole-constraints.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RAutoassignSpecification.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/Authorization.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationTransformer.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/MidPointPrincipal.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityContextManager.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/UserProfileService.java
    A repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/AuthorizationParameters.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/SecurityEnforcer.java
    A repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/AuthorizationLimitationsCollector.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityContextManagerImpl.java
    M repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/UserProfileServiceMock.java
    A repo/task-api/src/main/java/com/evolveum/midpoint/task/api/StatisticsCollectionStrategy.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskHandler.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskRunResult.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/JdbcPingTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/NoOpTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/WaitForSubtasksByPollingTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/WaitForTasksTaskHandler.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/CleanupTest.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/MockCycleTaskHandler.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/MockLongTaskHandler.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/MockSingleTaskHandler.java
    M repo/task-quartz-impl/src/test/resources/repo/task-022ExecuteRecurringOnDemand.xml
    M repo/task-quartz-impl/src/test/resources/repo/tasks-for-cleanup.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelivery.java
    A testing/story/src/test/resources/delivery/roles/role-it-1-for-tpu-10-elaine.xml
    R testing/story/src/test/resources/delivery/roles/role-it-1.xml
    A testing/story/src/test/resources/delivery/roles/role-it-2-for-tpu-10.xml
    R testing/story/src/test/resources/delivery/roles/role-it-2.xml
    A testing/story/src/test/resources/delivery/roles/role-it-3-for-tpu-10-and-cc-1900-elaine-administrator.xml
    R testing/story/src/test/resources/delivery/roles/role-it-3.xml
    A testing/story/src/test/resources/delivery/roles/role-it-4-not-for-tpu-10-elaine.xml
    A testing/story/src/test/resources/delivery/roles/role-it-5-requires-it-1-elaine.xml
    M testing/story/src/test/resources/delivery/rules/k10.xml
    A testing/story/src/test/resources/delivery/rules/k11-tpu-10-rem-elaine.xml
    A testing/story/src/test/resources/delivery/rules/k11.xml
    A testing/story/src/test/resources/delivery/rules/k20-it-1-rem-elaine.xml
    A testing/story/src/test/resources/delivery/rules/k20.xml
    A testing/story/src/test/resources/delivery/rules/k21-it-1-rem-elaine.xml
    A testing/story/src/test/resources/delivery/rules/k21.xml
    A testing/story/src/test/resources/delivery/rules/k23-rem-elaine.xml
    A testing/story/src/test/resources/delivery/rules/k23.xml
    A testing/story/src/test/resources/delivery/rules/library.xml
    M testing/story/src/test/resources/delivery/schema/rules.xsd
    M tools/pom.xml
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint

Conflicts:
	infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java


  Commit: 2a7edb607b21814cf12c4e47c4fcf44a3a330dee
      https://github.com/Evolveum/midpoint/commit/2a7edb607b21814cf12c4e47c4fcf44a3a330dee
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-08 (Wed, 08 Nov 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java

  Log Message:
  -----------
  midpoint functions impl - resolve entitlement function


  Commit: 9db7692a70dc5c2815972c9754327d337c55bb90
      https://github.com/Evolveum/midpoint/commit/9db7692a70dc5c2815972c9754327d337c55bb90
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-08 (Wed, 08 Nov 2017)

  Changed paths:
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java

  Log Message:
  -----------
  fixign notification formatter test - failed afterintroducing translations for metadata


  Commit: 6e8aa76327c950a67f0da13ae6436cbc68bc334d
      https://github.com/Evolveum/midpoint/commit/6e8aa76327c950a67f0da13ae6436cbc68bc334d
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-08 (Wed, 08 Nov 2017)

  Changed paths:
    M gui/admin-gui/.gitignore
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/DisplayNamePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/DisplayNamePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.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/component/TypedAssignablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.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/web/boot/WebSecurityConfig.java
    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/input/QNameChoiceRenderer.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/page/admin/configuration/PageDebugView.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/static/js/ace/ace.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-beautify.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-chromevox.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-elastic_tabstops_lite.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-emmet.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-error_marker.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-keybinding_menu.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-language_tools.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-linking.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-modelist.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-old_ie.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-searchbox.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-settings_menu.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-spellcheck.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-split.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-static_highlight.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-statusbar.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-textarea.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-themelist.js
    M gui/admin-gui/src/main/resources/static/js/ace/ext-whitespace.js
    M gui/admin-gui/src/main/resources/static/js/ace/keybinding-emacs.js
    M gui/admin-gui/src/main/resources/static/js/ace/keybinding-vim.js
    M gui/admin-gui/src/main/resources/static/js/ace/mode-css.js
    M gui/admin-gui/src/main/resources/static/js/ace/mode-groovy.js
    M gui/admin-gui/src/main/resources/static/js/ace/mode-html.js
    M gui/admin-gui/src/main/resources/static/js/ace/mode-java.js
    M gui/admin-gui/src/main/resources/static/js/ace/mode-javascript.js
    M gui/admin-gui/src/main/resources/static/js/ace/mode-json.js
    M gui/admin-gui/src/main/resources/static/js/ace/mode-plain_text.js
    M gui/admin-gui/src/main/resources/static/js/ace/mode-powershell.js
    M gui/admin-gui/src/main/resources/static/js/ace/mode-text.js
    M gui/admin-gui/src/main/resources/static/js/ace/mode-velocity.js
    M gui/admin-gui/src/main/resources/static/js/ace/mode-xml.js
    M gui/admin-gui/src/main/resources/static/js/ace/mode-xquery.js
    M gui/admin-gui/src/main/resources/static/js/ace/mode-yaml.js
    M gui/admin-gui/src/main/resources/static/js/ace/theme-eclipse.js
    M gui/admin-gui/src/main/resources/static/js/ace/worker-coffee.js
    M gui/admin-gui/src/main/resources/static/js/ace/worker-css.js
    M gui/admin-gui/src/main/resources/static/js/ace/worker-html.js
    M gui/admin-gui/src/main/resources/static/js/ace/worker-javascript.js
    M gui/admin-gui/src/main/resources/static/js/ace/worker-json.js
    M gui/admin-gui/src/main/resources/static/js/ace/worker-lua.js
    M gui/admin-gui/src/main/resources/static/js/ace/worker-php.js
    M gui/admin-gui/src/main/resources/static/js/ace/worker-xml.js
    M gui/admin-gui/src/main/resources/static/js/ace/worker-xquery.js
    M gui/admin-gui/src/main/resources/static/js/midpoint/ace-editor.js
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelElementContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.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/AssignmentPathImpl.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/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/projector/focus/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/MultiplicityConstraintEvaluator.java
    M model/model-intest/pom.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/AbstractImportTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
    M model/model-intest/src/test/resources/common/task-dumy-blue-livesync.xml
    A model/model-intest/src/test/resources/common/user-template-schema-constraints.xml
    A model/model-intest/src/test/resources/importer/user-constrained-wrong.json
    A model/model-intest/src/test/resources/importer/user-constrained-wrong.xml
    A model/model-intest/src/test/resources/importer/user-constrained-wrong.yaml
    A model/model-intest/src/test/resources/scripting/scripting-users-in-background-assign.xml
    M model/model-intest/src/test/resources/scripting/scripting-users-in-background-task.xml
    M model/model-intest/src/test/resources/scripting/scripting-users-in-background.xml
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.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/ConfirmationNotifier.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleFocalObjectNotifier.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleUserNotifier.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapVirtualGroup.java
    A testing/story/src/test/resources/ldap-virtualgroup/org-top.xml
    A testing/story/src/test/resources/ldap-virtualgroup/resource-opendj.xml
    A testing/story/src/test/resources/ldap-virtualgroup/role-it-hr-thisobject.xml
    A testing/story/src/test/resources/ldap-virtualgroup/role-it-hr.xml
    A testing/story/src/test/resources/ldap-virtualgroup/role-jobrole-devops.xml
    A testing/story/src/test/resources/ldap-virtualgroup/role-jobrole-multijobs.xml
    A testing/story/src/test/resources/ldap-virtualgroup/role-meta-ldap-thisobject.xml
    A testing/story/src/test/resources/ldap-virtualgroup/role-meta-ldap.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 952d44054841eaa5d8660e90210b5903c68c3a8b
      https://github.com/Evolveum/midpoint/commit/952d44054841eaa5d8660e90210b5903c68c3a8b
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-09 (Thu, 09 Nov 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/resources/common/custom-library.xml

  Log Message:
  -----------
  fixing tests


  Commit: f4e1e133ef760c26d4e3afb8ecbc149097864538
      https://github.com/Evolveum/midpoint/commit/f4e1e133ef760c26d4e3afb8ecbc149097864538
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-09 (Thu, 09 Nov 2017)

  Changed paths:
    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/web/boot/MidPointSpringApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableConfigurationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/Form.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/search/SearchFormPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/ExpressionVariableEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsClockPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsDebugUtilPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsTracesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.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/configuration/PageEvaluateMapping.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectSelectionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/RichHyperlinkConfigDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/RichHyperlinkConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.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/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageConnectorHosts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.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/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/MultiplicityPolicyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.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/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstances.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.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/login/PageLogin.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java
    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/component/DashboardSearchPanel.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/security/SecurityUtils.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/resources/static/js/midpoint-theme.js
    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

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/cbdf8ad0004c...f4e1e133ef76


More information about the midPoint-svn mailing list