[midPoint-git] [Evolveum/midpoint] 4c8135: probably fixing MID-5881

Katarina Valalikova noreply at github.com
Mon Feb 17 15:50:26 CET 2020


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 4c81350215e542de7f45f6f6dad5f0e479575945
      https://github.com/Evolveum/midpoint/commit/4c81350215e542de7f45f6f6dad5f0e479575945
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2020-02-17 (Mon, 17 Feb 2020)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/DataModelVisualizerImpl.java

  Log Message:
  -----------
  probably fixing MID-5881


  Commit: d0f39dde8ec4d7017051cf9b215b24863751529a
      https://github.com/Evolveum/midpoint/commit/d0f39dde8ec4d7017051cf9b215b24863751529a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2020-02-17 (Mon, 17 Feb 2020)

  Changed paths:
    M dist/javadoc/pom.xml
    M gui/admin-gui/pom.xml
    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.java
    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/password/PasswordPropertyPanel.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/gui/api/util/FeatureVisibleEnableBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/FocusTabVisibleBehavior.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/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/PrismObjectWrapperFactoryImpl.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemEditabilityHandler.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemPanelSettings.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemPanelSettingsBuilder.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismObjectValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismPropertyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismReferencePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/component/ExpressionPropertyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/CasSecurityConfig.java
    R 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/MidpointResponse.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/AssignmentEditorPanel.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/AssignmentsUtil.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/menu/UserMenuPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.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/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/InternalsLoggedInUsersPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/PersonalInfoPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.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/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.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/forgetpassword/PageResetPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.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/login/PageRegistrationConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationFinish.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.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/PageAssignmentsList.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageOrgSelfProfile.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PagePostAuthentication.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRoleSelfProfile.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfProfile.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfProfile.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageServiceSelfProfile.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageUserSelfProfile.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/AuditedAccessDeniedHandler.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/AuditedLogoutHandler.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/BasicMidPointAuthenticationSuccessHandler.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/BasicWebSecurityConfig.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/MidPointAuthenticationSuccessHandler.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/security/MidpointHttpAuthorizationEvaluator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/channel/AuthenticationChannelImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/factory/module/AbstractCredentialModuleFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/factory/module/HttpHeaderModuleFactory.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/factory/module/LdapModuleFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/factory/module/Saml2ModuleFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/filter/HttpBasicAuthenticationFilter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/filter/HttpSecurityQuestionsAuthenticationFilter.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/filter/LdapAuthenticationFilter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/filter/MidpointAuthFilter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/filter/MidpointUsernamePasswordAuthenticationFilter.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/module/HttpHeaderModuleWebConfig.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/module/HttpHeaderModuleWebSecurityConfig.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/module/LdapWebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/module/LoginFormModuleWebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/module/SamlModuleWebSecurityConfig.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/module/authentication/LdapAuthenticationToken.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/module/authentication/LdapModuleAuthentication.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/module/configuration/LdapModuleWebSecurityConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/module/configuration/ModuleWebSecurityConfigurationImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/provider/ClusterProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/provider/MailNonceProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/provider/MidPointAbstractAuthenticationProvider.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/provider/MidPointLdapAuthenticationProvider.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/provider/MidpointSaml2Provider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/provider/PasswordProvider.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/provider/Saml2Provider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/provider/SecurityQuestionProvider.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/util/MidpointHttpServletRequest.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/util/SecurityUtils.java
    M gui/admin-gui/src/main/resources/ctx-web-security-cas.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
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationSecurity.java
    M icf-connectors/dummy-connector-fake/pom.xml
    M infra/common/pom.xml
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Containerable.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/CloneUtil.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ContainerDeltaImpl.java
    M infra/prism-maven-plugin/pom.xml
    M infra/schema-pure-jaxb/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectDeltaSchemaLevelUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SystemConfigurationTypeUtil.java
    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-asynchronous-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-case-management-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-certification-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-notifications-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-security-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/test-util/pom.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M model/certification-impl/pom.xml
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertCaseOperationsHelper.java
    M model/model-api/pom.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/AuthenticationEvaluator.java
    M 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/ModelInteractionService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/AuthenticationChannel.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/CompiledGuiProfile.java
    R model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/CompiledUserProfile.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/GuiProfiledPrincipal.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/GuiProfiledPrincipalManager.java
    R model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/MidPointLdapAuthenticationProvider.java
    R model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/MidPointUserProfilePrincipal.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/MidpointDirContextAdapter.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/ModuleAuthentication.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/NameOfModuleType.java
    R model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/UserProfileService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AbstractAuthenticationContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/NonceAuthenticationContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PasswordAuthenticationContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PreAuthenticationContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/SecurityQuestionsAuthenticationContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/DeputyUtils.java
    M model/model-common/pom.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/SystemObjectCache.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/AbstractModelWebService.java
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ClusterRestService.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/FocusComputer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/UserComputer.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/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/DataModelVisualizerImpl.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/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/LensContext.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/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.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/mappings/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingSetEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/NextRecompute.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/ClusterwideUserSessionManagerImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/GuiProfileCompiler.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/GuiProfiledPrincipalManagerImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointPasswordValidator.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/MidpointRestPasswordAuthenticator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestSecurityQuestionsAuthenticator.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/SpringAuthenticationInjectorInterceptor.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileCompiler.java
    R 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/util/AuditHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DataModelUtil.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestGuiProfiledPrincipalManager.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestNonceAuthenticationEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestPasswordAuthenticationEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestSecurityQuestionsAuthenticationEvaluator.java
    R model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestUserProfileService.java
    M model/model-impl/testng-unit.xml
    M model/model-intest/pom.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLifecycle.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/AbstractArchetypesTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestArchetypes.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/misc/TestMigration.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/TestSecurityPrincipal.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
    M model/model-intest/src/test/resources/mapping/resource-dummy-tea-green.xml
    A model/model-intest/src/test/resources/mapping/resource-dummy-timed.xml
    A model/model-intest/src/test/resources/mapping/role-timed.xml
    M model/model-test/pom.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    A model/model-test/src/main/java/com/evolveum/midpoint/model/test/asserter/CompiledGuiProfileAsserter.java
    R model/model-test/src/main/java/com/evolveum/midpoint/model/test/asserter/CompiledUserProfileAsserter.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleTaskNotifier.java
    M model/report-impl/pom.xml
    M model/workflow-impl/pom.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/access/AuthorizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/engine/actions/CompleteWorkItemsAction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/engine/actions/DelegateWorkItemsAction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/engine/helpers/AuditHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/engine/helpers/WorkItemHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ModelInvocationContext.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/StartInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpStartInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.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 pom.xml
    M provisioning/provisioning-impl/pom.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadowmanager/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/ucf-impl-builtin/pom.xml
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/TransformationalAsyncUpdateMessageListener.java
    M provisioning/ucf-impl-connid/pom.xml
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/audit-impl/pom.xml
    M repo/repo-cache/pom.xml
    M repo/repo-common/pom.xml
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java
    M repo/repo-sql-impl/pom.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.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/MidPointPrincipalManager.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityContextManager.java
    M repo/security-enforcer-api/pom.xml
    M repo/security-enforcer-impl/pom.xml
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java
    M repo/security-impl/pom.xml
    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/MidPointPrincipalManagerMock.java
    M repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.java
    M repo/system-init/pom.xml
    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/test/NullTaskImpl.java
    M repo/task-quartz-impl/pom.xml
    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/TaskQuartzImplUtil.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/ExecutionManager.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/execution/TaskSynchronizer.java
    M testing/conntest/pom.xml
    M testing/longtest/pom.xml
    M testing/pom.xml
    M testing/rest/pom.xml
    M testing/samples-test/pom.xml
    M testing/sanity/pom.xml
    M testing/schrodingertest/pom.xml
    M testing/story/pom.xml
    M tools/ninja/pom.xml
    M tools/schrodinger/pom.xml

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

# Conflicts:
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/DataModelVisualizerImpl.java


Compare: https://github.com/Evolveum/midpoint/compare/ce48422abe40...d0f39dde8ec4


More information about the midPoint-svn mailing list