[midPoint-git] [Evolveum/midpoint] eddaca: Various fixes in RW (unfinished).

Petr Gašparík petr.gasparik at ami.cz
Thu Jun 2 23:41:40 CEST 2016


  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: eddaca6bbc8df3b80a89eeaa4b1106f1e9bb970f
      https://github.com/Evolveum/midpoint/commit/eddaca6bbc8df3b80a89eeaa4b1106f1e9bb970f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/NonEmptyLoadableModel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/NonEmptyModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityStepDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ObjectClassDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ObjectClassDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/SchemaHandlingDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java

  Log Message:
  -----------
  Various fixes in RW (unfinished).


  Commit: 8d70f226415eab7db854ee5cb59caa630f424268
      https://github.com/Evolveum/midpoint/commit/8d70f226415eab7db854ee5cb59caa630f424268
  Author: petr.gasparik <petr.gasparik at ami.cz>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    A gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_hu_HU.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_ru_RU.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
    M gui/admin-gui/src/main/resources/localization/locale.properties

  Log Message:
  -----------
  simplification of language codes


  Commit: 1712bf310fc4140d9fbe1ce074039966f3dfde6a
      https://github.com/Evolveum/midpoint/commit/1712bf310fc4140d9fbe1ce074039966f3dfde6a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M model/model-intest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Increasing task manager logging to hunt down MID-3036


  Commit: 49970cc0a597bcbf03b05ba004cdacbc00187367
      https://github.com/Evolveum/midpoint/commit/49970cc0a597bcbf03b05ba004cdacbc00187367
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java

  Log Message:
  -----------
  Better error message in the test


  Commit: f685b46ee4c709424f77cccd3b403aa286977c65
      https://github.com/Evolveum/midpoint/commit/f685b46ee4c709424f77cccd3b403aa286977c65
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java

  Log Message:
  -----------
  Possible fix for one of the ocasional test failures (MID-3048)


  Commit: a93fffcd07d6f3275b880d1209a9f5af654d3706
      https://github.com/Evolveum/midpoint/commit/a93fffcd07d6f3275b880d1209a9f5af654d3706
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M samples/stories/multitenant-idm-saas/resources/openldap-customers.xml

  Log Message:
  -----------
  Added missing objectSynchronization sections for ou and groups.


  Commit: e530cf50ca80c954402ecc166494a2f3a2d2f69a
      https://github.com/Evolveum/midpoint/commit/e530cf50ca80c954402ecc166494a2f3a2d2f69a
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-22 (Sun, 22 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java

  Log Message:
  -----------
  added confirmation window for account deletion operation


  Commit: 4b5b7d353fffe5f7f6e34864ce6077dd2db5f645
      https://github.com/Evolveum/midpoint/commit/4b5b7d353fffe5f7f6e34864ce6077dd2db5f645
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-22 (Sun, 22 May 2016)

  Changed paths:
    M .travis.yml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeDialogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneButtonPanel.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/wf/WorkItemsPanel.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/home/PageDashboard.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.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/ResourceDetailsTabPanel.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/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/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/workflow/ProcessInstancesPanel.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/self/PageSelfDashboard.html
    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/page/self/PageSelfProfile.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
    A gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_hu_HU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_ru_RU.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
    M gui/admin-gui/src/main/resources/localization/locale.properties
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M gui/admin-gui/src/main/webapp/js/midpoint-theme.js
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    A infra/common/src/main/java/com/evolveum/midpoint/common/SynchronizationUtils.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/ResourceTypeUtil.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SynchronizationSituationUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluatorFactory.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.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/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/projector/ContextLoader.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/sync/SynchronizationServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.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/AbstractInitializedModelIntegrationTest.java
    A 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/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/common/resource-dummy-green.xml
    A model/model-intest/src/test/resources/common/role-buccaneer-green.xml
    A model/model-intest/src/test/resources/common/role-pirate-green.xml
    A 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/sync/password-policy-azure.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-azure-deprecated.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-azure.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/Checker.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M samples/stories/multitenant-idm-saas/resources/openldap-customers.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java

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


  Commit: db47dbfba13c4cea0051e26a090d3857033f8f37
      https://github.com/Evolveum/midpoint/commit/db47dbfba13c4cea0051e26a090d3857033f8f37
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java

  Log Message:
  -----------
  Another possible test fix for random sync test failures (MID-3048)


  Commit: 93719f1eb7b359f26da913dec55dda6d4b87af64
      https://github.com/Evolveum/midpoint/commit/93719f1eb7b359f26da913dec55dda6d4b87af64
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java

  Log Message:
  -----------
  Fixing 389ds conntests


  Commit: 535393c20c3ccc7ebad965da92b354bdcf8c6913
      https://github.com/Evolveum/midpoint/commit/535393c20c3ccc7ebad965da92b354bdcf8c6913
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M .travis.yml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.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/wf/WorkItemsPanel.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/home/component/AsyncDashboardPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.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/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/workflow/ProcessInstancesPanel.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/self/PageSelfDashboard.html
    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/page/self/PageSelfProfile.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_hu_HU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_ru_RU.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
    M gui/admin-gui/src/main/resources/localization/locale.properties
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M gui/admin-gui/src/main/webapp/js/midpoint-theme.js
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluatorFactory.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.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/InboundProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/sync/password-policy-azure.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-azure-deprecated.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-azure.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M samples/stories/multitenant-idm-saas/resources/openldap-customers.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java

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


  Commit: 76c588f74265e48e4fafc6912f136a38d347012d
      https://github.com/Evolveum/midpoint/commit/76c588f74265e48e4fafc6912f136a38d347012d
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java

  Log Message:
  -----------
  MID-2709 MIDPOINT_HOME/tmp dir fix


  Commit: 37911a3bb8454afb556b2ed2888ee31576f9a00d
      https://github.com/Evolveum/midpoint/commit/37911a3bb8454afb556b2ed2888ee31576f9a00d
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java

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


  Commit: de0a76c52299013cee282b10c9c9eb9270281083
      https://github.com/Evolveum/midpoint/commit/de0a76c52299013cee282b10c9c9eb9270281083
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java

  Log Message:
  -----------
  Request a role panel: fixing filter by user functionality


  Commit: 79c2b9b394ad7f5c25832537cda8e0be7d000787
      https://github.com/Evolveum/midpoint/commit/79c2b9b394ad7f5c25832537cda8e0be7d000787
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java

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


  Commit: f257d4ec8d765e5bbf3cca339d34475b2c1cbf68
      https://github.com/Evolveum/midpoint/commit/f257d4ec8d765e5bbf3cca339d34475b2c1cbf68
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.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/lens/projector/ConsolidationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/resources/common/user-template-complex-include.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Fixing normal-strength mappings on object template (MID-3040)


  Commit: 06ee46f3a9e1b5f8c5dc9b72b5a1047c77bc855e
      https://github.com/Evolveum/midpoint/commit/06ee46f3a9e1b5f8c5dc9b72b5a1047c77bc855e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestTriggerTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/MockTriggerHandler.java

  Log Message:
  -----------
  Fixing multiple invocations of recomputation in validity and trigger scanner tasks (+ tests).


  Commit: 5b8242af69597b0aea3acd4f1b9bff285316030f
      https://github.com/Evolveum/midpoint/commit/5b8242af69597b0aea3acd4f1b9bff285316030f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.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/lens/projector/ConsolidationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/resources/common/user-template-complex-include.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java

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


  Commit: 43f036f67bf5a8cc1ca56fe3e0fdfca9da17f0e6
      https://github.com/Evolveum/midpoint/commit/43f036f67bf5a8cc1ca56fe3e0fdfca9da17f0e6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAdminWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesAll.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesRequestedBy.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesRequestedFor.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
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsAll.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsAllocatedToMe.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/ProcessInstancesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
    M gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java

  Log Message:
  -----------
  Cleaned-up workflow authorizations, mainly in GUI.


  Commit: 8beaea9543b9f733be0576df0cfd6c7ab1163fab
      https://github.com/Evolveum/midpoint/commit/8beaea9543b9f733be0576df0cfd6c7ab1163fab
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    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/ModelService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java

  Log Message:
  -----------
  Added workaround for "read all work items" authorization check.


  Commit: 9d73d84e2866d9737b5e1ea4cd329e911f2fc348
      https://github.com/Evolveum/midpoint/commit/9d73d84e2866d9737b5e1ea4cd329e911f2fc348
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/refresh/AutoRefreshPanel.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/server/TaskSummaryPanel.java

  Log Message:
  -----------
  Fixed style for auto-refresh panel for tasks.


  Commit: 9f2d5d03bbb9948c23a14bd73ca24d25a7e3816c
      https://github.com/Evolveum/midpoint/commit/9f2d5d03bbb9948c23a14bd73ca24d25a7e3816c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryEngine2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/RQueryImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaAnyContainerDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/RootHibernateQuery.java

  Log Message:
  -----------
  Fixed querying unqualified extension items (MID-2796)


  Commit: 54dd6fe9f76be3c519fa9e80651697bce753d0e8
      https://github.com/Evolveum/midpoint/commit/54dd6fe9f76be3c519fa9e80651697bce753d0e8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.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/server/TaskBasicTabPanel.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/workflow/PageProcessInstances.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M model/workflow-impl/src/test/resources/common/system-configuration.xml

  Log Message:
  -----------
  Fixed breadcrumb for PageTaskEdit (missing page parameters) + fixed wf tests.


  Commit: b26ef2b22c29cce0e837b7566fddacba2eb6fa07
      https://github.com/Evolveum/midpoint/commit/b26ef2b22c29cce0e837b7566fddacba2eb6fa07
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  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/prism/show/SceneItemValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java

  Log Message:
  -----------
  Changed object type icons to uncolored (black) ones - for certifications, approvals, and preview changes.


  Commit: e5169074e93097dcc5ce71b4b78cb4e351e61379
      https://github.com/Evolveum/midpoint/commit/e5169074e93097dcc5ce71b4b78cb4e351e61379
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertExpressionHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ModelExpressionThreadLocalHolder.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/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationConfirmationEvaluator.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/BaseHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/helpers/BaseHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GcpExpressionHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java

  Log Message:
  -----------
  Involve ModelExpressionThreadLocalHolder in expression evaluation at various places (notifications, workflows, correlation/confirmation, ...) - MID-2373. However, there are some places still not covered.


  Commit: 5b1100ad4a9f62810036bac185cc8db96cd59a54
      https://github.com/Evolveum/midpoint/commit/5b1100ad4a9f62810036bac185cc8db96cd59a54
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java

  Log Message:
  -----------
  Fixed handling protected accounts specified by (deprecated) icfs:uid.


  Commit: f6ac94127bc2261befb8e6bf906487084cb60ae3
      https://github.com/Evolveum/midpoint/commit/f6ac94127bc2261befb8e6bf906487084cb60ae3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/EnvironmentalPerformanceInformation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java

  Log Message:
  -----------
  Temporary workaround for MID-2866.


  Commit: c64fd3be712952dc1d47910c1ebe5f67a802098b
      https://github.com/Evolveum/midpoint/commit/c64fd3be712952dc1d47910c1ebe5f67a802098b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

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

  Log Message:
  -----------
  Fixed recent test failures.


  Commit: 1de4067128a5583422a722e6279bda55b90f2b72
      https://github.com/Evolveum/midpoint/commit/1de4067128a5583422a722e6279bda55b90f2b72
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContext.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/StateReporter.java

  Log Message:
  -----------
  Fixed MID-2854.


  Commit: 3b900ff8cd60ce93d8f283ae15218cadf6a65dc7
      https://github.com/Evolveum/midpoint/commit/3b900ff8cd60ce93d8f283ae15218cadf6a65dc7
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ucf/TestUcfOpenDj.java

  Log Message:
  -----------
  Test for connector configuraiton property ordering (MID-2642)


  Commit: 0fd5fc8d680a87568d03fa3a425ee93b98736241
      https://github.com/Evolveum/midpoint/commit/0fd5fc8d680a87568d03fa3a425ee93b98736241
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContext.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/StateReporter.java

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


  Commit: 22de2bde9018bc15701f0b9a5f0ddb63aed4b9de
      https://github.com/Evolveum/midpoint/commit/22de2bde9018bc15701f0b9a5f0ddb63aed4b9de
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java

  Log Message:
  -----------
  Some logging in repo impl.


  Commit: 3fdc3c5ac82ef307c970a54632086efb11a421db
      https://github.com/Evolveum/midpoint/commit/3fdc3c5ac82ef307c970a54632086efb11a421db
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ucf/TestUcfOpenDj.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 586865e09b2af81c61d5ae51a69335f069fb92a8
      https://github.com/Evolveum/midpoint/commit/586865e09b2af81c61d5ae51a69335f069fb92a8
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql

  Log Message:
  -----------
  fixed cleanup procedure for repository tests


  Commit: c8048c5d33a977cb39bcf93f9c4620706b4e1a44
      https://github.com/Evolveum/midpoint/commit/c8048c5d33a977cb39bcf93f9c4620706b4e1a44
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    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/session/SessionStorage.java

  Log Message:
  -----------
  removed unused code from session storage


  Commit: d95f0b506ad70d237920a25ffed9a2abd4daa4b1
      https://github.com/Evolveum/midpoint/commit/d95f0b506ad70d237920a25ffed9a2abd4daa4b1
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    A samples/resources/edirectory/resource-edirectory-nosync.xml

  Log Message:
  -----------
  eDirectory sample using eDirectory connector


  Commit: 566755eced48e13b9c0679ed439f444532d6e9ed
      https://github.com/Evolveum/midpoint/commit/566755eced48e13b9c0679ed439f444532d6e9ed
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    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/session/SessionStorage.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ucf/TestUcfOpenDj.java
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java

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


  Commit: 00a407da663ca6aa59c0aaf9173d33cb42a0fdd1
      https://github.com/Evolveum/midpoint/commit/00a407da663ca6aa59c0aaf9173d33cb42a0fdd1
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  MID-3065 displayName attribute is updated in schema and contains now the property key instead of real displayed value


  Commit: 3fc94be2298725721abc111c57df975ed4e48923
      https://github.com/Evolveum/midpoint/commit/3fc94be2298725721abc111c57df975ed4e48923
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/NonEmptyLoadableModel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/NonEmptyModel.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/WebComponentUtil.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/SceneItemValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/refresh/AutoRefreshPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityStepDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ObjectClassDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ObjectClassDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/SchemaHandlingDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.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/server/TaskBasicTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.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/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAdminWorkItems.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/PageProcessInstancesAll.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesRequestedBy.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesRequestedFor.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
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsAll.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsAllocatedToMe.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/ProcessInstancesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.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/session/SessionStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java
    M gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/EnvironmentalPerformanceInformation.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertExpressionHelper.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/ModelService.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/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ModelExpressionThreadLocalHolder.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/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M 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/sync/CorrelationConfirmationEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestTriggerTask.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/sync/TestValidityRecomputeTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/MockTriggerHandler.java
    M model/model-intest/src/test/resources/common/user-template-complex-include.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/BaseHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/helpers/BaseHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GcpExpressionHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContext.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/StateReporter.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ucf/TestUcfOpenDj.java
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryEngine2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/RQueryImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaAnyContainerDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/RootHibernateQuery.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    A samples/resources/edirectory/resource-edirectory-nosync.xml

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


  Commit: 9a3128d483eabc87254f79f6d3b940d39b6a0d7d
      https://github.com/Evolveum/midpoint/commit/9a3128d483eabc87254f79f6d3b940d39b6a0d7d
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql

  Log Message:
  -----------
  added another table to cleanup procedures


  Commit: 79735c9135d8aac291a73470341de2bce82e01ff
      https://github.com/Evolveum/midpoint/commit/79735c9135d8aac291a73470341de2bce82e01ff
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/EnvironmentalPerformanceInformation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/MappingsStatisticsKey.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsCollector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

  Log Message:
  -----------
  Fixing MID-2866.


  Commit: db63d58fce546d8d00b7a9c5b3283db3a187084a
      https://github.com/Evolveum/midpoint/commit/db63d58fce546d8d00b7a9c5b3283db3a187084a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    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/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    A samples/resources/edirectory/resource-edirectory-nosync.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: b4e89ac4d07f16f80f3b08ced8d1f3b8ae34d629
      https://github.com/Evolveum/midpoint/commit/b4e89ac4d07f16f80f3b08ced8d1f3b8ae34d629
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReporter.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

  Log Message:
  -----------
  Fixed preview page navigation (MID-3070 and others). Fixed breadcrumb update when navigating back.


  Commit: bb5da89bd48c23d84bbccbebc36f80f98a707e0f
      https://github.com/Evolveum/midpoint/commit/bb5da89bd48c23d84bbccbebc36f80f98a707e0f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java

  Log Message:
  -----------
  subsring operation on PolyString


  Commit: 300786e8417a39704be004d8c68e198c2cc4c6d8
      https://github.com/Evolveum/midpoint/commit/300786e8417a39704be004d8c68e198c2cc4c6d8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    A model/model-intest/src/test/resources/object-template/role-rastaman.xml

  Log Message:
  -----------
  Tests for normal mappings in object template and assignment focusMappings (MID-3040)


  Commit: 6326a6d8594fca2afd79c9323241711efabb0494
      https://github.com/Evolveum/midpoint/commit/6326a6d8594fca2afd79c9323241711efabb0494
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismContext.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java

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


  Commit: f22f005e35328a7175df5d79b4d904aff7b718f2
      https://github.com/Evolveum/midpoint/commit/f22f005e35328a7175df5d79b4d904aff7b718f2
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReporter.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 infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/EnvironmentalPerformanceInformation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/MappingsStatisticsKey.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsCollector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    A model/model-intest/src/test/resources/object-template/role-rastaman.xml
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

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


  Commit: c2a3808d642e94c262968b3ab2953f030138f572
      https://github.com/Evolveum/midpoint/commit/c2a3808d642e94c262968b3ab2953f030138f572
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java

  Log Message:
  -----------
  Added MID-1922 related tests.


  Commit: a8d0da1290cc7890c8cb3b10e604e0a6e5741cbe
      https://github.com/Evolveum/midpoint/commit/a8d0da1290cc7890c8cb3b10e604e0a6e5741cbe
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismContext.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    A model/model-intest/src/test/resources/object-template/role-rastaman.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: e80887a768af2368afe13d38c40b80c689549749
      https://github.com/Evolveum/midpoint/commit/e80887a768af2368afe13d38c40b80c689549749
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java

  Log Message:
  -----------
  MID-2878


  Commit: 281db8bbe3b609d329008a102e68a08933655b38
      https://github.com/Evolveum/midpoint/commit/281db8bbe3b609d329008a102e68a08933655b38
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd

  Log Message:
  -----------
  further schema updates (displayName attribute now contains property key instead of real displayed value)


  Commit: 418a610833fe42c13420803eeb0349e13a5eae31
      https://github.com/Evolveum/midpoint/commit/418a610833fe42c13420803eeb0349e13a5eae31
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java

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


  Commit: b0e042ccc00821c735b6dc825f8b04f2a08131b3
      https://github.com/Evolveum/midpoint/commit/b0e042ccc00821c735b6dc825f8b04f2a08131b3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M config/sql/midpoint/3.4/h2/h2-3.4.sql
    M config/sql/midpoint/3.4/h2/h2-upgrade-3.3-3.4.sql
    A config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-6.sql
    M config/sql/midpoint/3.4/mysql/mysql-3.4.sql
    M config/sql/midpoint/3.4/mysql/mysql-upgrade-3.3-3.4.sql
    A config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-6.sql
    M config/sql/midpoint/3.4/oracle/oracle-3.4.sql
    M config/sql/midpoint/3.4/oracle/oracle-upgrade-3.3-3.4.sql
    A config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-6.sql
    M config/sql/midpoint/3.4/postgresql/postgresql-3.4.sql
    M config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.3-3.4.sql
    A config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-6.sql
    M config/sql/midpoint/3.4/sqlserver/sqlserver-3.4.sql
    M config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.3-3.4.sql
    A config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-6.sql
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.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/ROrg.java

  Log Message:
  -----------
  MID-3061 (AbstractRole identifier, riskLevel, displayName made searchable) incl. db scripts


  Commit: 8e66b5397570d17913aa17c3a5771f6e507ca8ca
      https://github.com/Evolveum/midpoint/commit/8e66b5397570d17913aa17c3a5771f6e507ca8ca
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: abd5290604f14e0c2f2b069c2e40319aa091a603
      https://github.com/Evolveum/midpoint/commit/abd5290604f14e0c2f2b069c2e40319aa091a603
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    A infra/schema/src/main/resources/localization/schema.properties
    A infra/schema/src/main/resources/localization/schema_en.properties

  Log Message:
  -----------
  Splitting localization files into schema and GUI parts.


  Commit: 17de0a214c31ee958ec9e51520e8c90abd02343a
      https://github.com/Evolveum/midpoint/commit/17de0a214c31ee958ec9e51520e8c90abd02343a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  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/page/admin/server/PageTasks.java

  Log Message:
  -----------
  Task list: icons for referenced objects.


  Commit: a8da75646fa8128c7301bdccf1606c1adcee36c7
      https://github.com/Evolveum/midpoint/commit/a8da75646fa8128c7301bdccf1606c1adcee36c7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    A infra/schema/src/main/resources/localization/schema.properties
    A infra/schema/src/main/resources/localization/schema_en.properties

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: dd679e89beb72f231a54012509235a58a7af4d01
      https://github.com/Evolveum/midpoint/commit/dd679e89beb72f231a54012509235a58a7af4d01
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java

  Log Message:
  -----------
  Handling ConnId RetryableException (MID-3067)


  Commit: 453445386360a52c43fef28d883dd1e7fab429e9
      https://github.com/Evolveum/midpoint/commit/453445386360a52c43fef28d883dd1e7fab429e9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java

  Log Message:
  -----------
  Resolving localization keys in notifications and GUI delta viewer.


  Commit: ddaed98596f27244710475723517c5c69e5940de
      https://github.com/Evolveum/midpoint/commit/ddaed98596f27244710475723517c5c69e5940de
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java

  Log Message:
  -----------
  Fixed TestEditSchema (localization keys)


  Commit: a46a4fc90db3241f528db568d0cf77981cf70c90
      https://github.com/Evolveum/midpoint/commit/a46a4fc90db3241f528db568d0cf77981cf70c90
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: d9483eeeae7bbfd43837d694d66b12649620bc03
      https://github.com/Evolveum/midpoint/commit/d9483eeeae7bbfd43837d694d66b12649620bc03
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.html
    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/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  "Save" button on preview page (temporary implementation).


  Commit: 52c25721db7d61a10024e9fe57ef863cf9c455ad
      https://github.com/Evolveum/midpoint/commit/52c25721db7d61a10024e9fe57ef863cf9c455ad
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestUnitObjectWrapperFactory.java

  Log Message:
  -----------
  fixing test


  Commit: b4936eff674b13e68c2bb2db730e8333ce746010
      https://github.com/Evolveum/midpoint/commit/b4936eff674b13e68c2bb2db730e8333ce746010
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M config/sql/midpoint/3.4/h2/h2-3.4.sql
    M config/sql/midpoint/3.4/h2/h2-upgrade-3.3-3.4.sql
    A config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-6.sql
    M config/sql/midpoint/3.4/mysql/mysql-3.4.sql
    M config/sql/midpoint/3.4/mysql/mysql-upgrade-3.3-3.4.sql
    A config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-6.sql
    M config/sql/midpoint/3.4/oracle/oracle-3.4.sql
    M config/sql/midpoint/3.4/oracle/oracle-upgrade-3.3-3.4.sql
    A config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-6.sql
    M config/sql/midpoint/3.4/postgresql/postgresql-3.4.sql
    M config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.3-3.4.sql
    A config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-6.sql
    M config/sql/midpoint/3.4/sqlserver/sqlserver-3.4.sql
    M config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.3-3.4.sql
    A config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-6.sql
    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
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.html
    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/SceneItemLinePanel.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/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    A infra/schema/src/main/resources/localization/schema.properties
    A infra/schema/src/main/resources/localization/schema_en.properties
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.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/ROrg.java

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


  Commit: babe8a6fb6613caa333c9b5162cce96775c52274
      https://github.com/Evolveum/midpoint/commit/babe8a6fb6613caa333c9b5162cce96775c52274
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java

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


  Commit: 86558408cd6d2da70374280b561adee60fde4a31
      https://github.com/Evolveum/midpoint/commit/86558408cd6d2da70374280b561adee60fde4a31
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    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/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.java

  Log Message:
  -----------
  fixing properties sorting on the focus edit page


  Commit: cb243e46880416c8dd39585f26235f73beab2fa4
      https://github.com/Evolveum/midpoint/commit/cb243e46880416c8dd39585f26235f73beab2fa4
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDiff.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.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/TestInbounds.java
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/testng-integration.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java

  Log Message:
  -----------
  Making inbound processor more generic (item instead of property, MID-2689) + some cleanup


  Commit: 37ced7a6efbf0661c7af337c32bf16e9c3712a47
      https://github.com/Evolveum/midpoint/commit/37ced7a6efbf0661c7af337c32bf16e9c3712a47
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    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

  Log Message:
  -----------
  Trying to replicate MID-3080 under normal circumstances + minor test cleanup


  Commit: a8a2e47cd55818ee3de87212dba112c4ad443840
      https://github.com/Evolveum/midpoint/commit/a8a2e47cd55818ee3de87212dba112c4ad443840
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.java

  Log Message:
  -----------
  MID-3075 added filter to component feedback panel


  Commit: 0258f58dc54051686a4c9384233bddaf05b862c1
      https://github.com/Evolveum/midpoint/commit/0258f58dc54051686a4c9384233bddaf05b862c1
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDiff.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.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/TestInbounds.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/testng-integration.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java

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


  Commit: 84a96e040ce72501741707bdbae4e0c771c24cfc
      https://github.com/Evolveum/midpoint/commit/84a96e040ce72501741707bdbae4e0c771c24cfc
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Property.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItem.java

  Log Message:
  -----------
  fixing display name of the search attributes on the Search panel


  Commit: de42e95eeea7388b39c4b0f63fed9ba6a4ebb4b9
      https://github.com/Evolveum/midpoint/commit/de42e95eeea7388b39c4b0f63fed9ba6a4ebb4b9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Property.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java

  Log Message:
  -----------
  Fixed NPE in resource list + in RW.


  Commit: a0059c5d79a521501f0f20df3807244f264e5cf6
      https://github.com/Evolveum/midpoint/commit/a0059c5d79a521501f0f20df3807244f264e5cf6
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    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/lens/projector/InboundProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestInbounds.java
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml

  Log Message:
  -----------
  Experimental support for tolerant mappings, which also fixes MID-3080 (+test)


  Commit: 6723e41eb2cb4b0c42fa01b436ad09c01d0c5ef0
      https://github.com/Evolveum/midpoint/commit/6723e41eb2cb4b0c42fa01b436ad09c01d0c5ef0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestInbounds.java
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml

  Log Message:
  -----------
  Fixing several issues with inbound mappings (MID-2421)


  Commit: cdebddbc391db69499828d6ab57c9471837d9f08
      https://github.com/Evolveum/midpoint/commit/cdebddbc391db69499828d6ab57c9471837d9f08
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java

  Log Message:
  -----------
  Move synchronization step just after schema handling one. Fixed bug preventing editing sync. entry for newly created resource.


  Commit: 2e02a3069314690c5565cb365ae4081e21913e2d
      https://github.com/Evolveum/midpoint/commit/2e02a3069314690c5565cb365ae4081e21913e2d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java

  Log Message:
  -----------
  Fixed closing tasks with groovy "variable not found" exceptions.


  Commit: 46f9765e76da29acff45638755510fe46e05e484
      https://github.com/Evolveum/midpoint/commit/46f9765e76da29acff45638755510fe46e05e484
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java

  Log Message:
  -----------
  Fixing som 389ds conntests


  Commit: 92740020bd4550b7c8d2c334bc0fd4329af90acd
      https://github.com/Evolveum/midpoint/commit/92740020bd4550b7c8d2c334bc0fd4329af90acd
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  <since> annotation for recently added elements


  Commit: eabe4d5ac4b6345a9ecadb271c475805eefc891c
      https://github.com/Evolveum/midpoint/commit/eabe4d5ac4b6345a9ecadb271c475805eefc891c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ConcurrencyTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java

  Log Message:
  -----------
  Fixing intermittent errors caused by repo wrongly reporting FATAL_ERROR on some (handled) concurrency issues.


  Commit: b97305076144babc025bde53acfdbb29e817d625
      https://github.com/Evolveum/midpoint/commit/b97305076144babc025bde53acfdbb29e817d625
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    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/lens/projector/InboundProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestInbounds.java
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: ec24cfde9ce96abcde6c7421dbb4af124fd648b4
      https://github.com/Evolveum/midpoint/commit/ec24cfde9ce96abcde6c7421dbb4af124fd648b4
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAccount.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/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/sync/resource-dummy-lime-deprecated.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-lime.xml
    A model/model-intest/src/test/resources/sync/user-template-lime.xml

  Log Message:
  -----------
  Reproducing MID-2427


  Commit: 9f0794e871ea194617e4d944af7fee30810e98b8
      https://github.com/Evolveum/midpoint/commit/9f0794e871ea194617e4d944af7fee30810e98b8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-28 (Sat, 28 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml

  Log Message:
  -----------
  Changed icons on user dashboard to match our conventions.


  Commit: 96539866575f1b2a10950ef6da843998a35646d5
      https://github.com/Evolveum/midpoint/commit/96539866575f1b2a10950ef6da843998a35646d5
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchShadowOwnerTest.java

  Log Message:
  -----------
  shadow owner test fix


  Commit: c48564b7360b70c1703d567b4c816666baa9a490
      https://github.com/Evolveum/midpoint/commit/c48564b7360b70c1703d567b4c816666baa9a490
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java

  Log Message:
  -----------
  MID-2856 fixing request for Request a role page


  Commit: 2a718bb36a4a051b4b6a01952be2e8270eab7ecb
      https://github.com/Evolveum/midpoint/commit/2a718bb36a4a051b4b6a01952be2e8270eab7ecb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.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-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.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/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml

  Log Message:
  -----------
  Fixing severl inbound issues (MID-2427 and others) and mapping output ambinguity


  Commit: d5e2688452e0805c6a5c4480bdc6b4cdfc69a692
      https://github.com/Evolveum/midpoint/commit/d5e2688452e0805c6a5c4480bdc6b4cdfc69a692
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Property.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAccount.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    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-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.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/TestInbounds.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-lime-deprecated.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-lime.xml
    A model/model-intest/src/test/resources/sync/user-template-lime.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ConcurrencyTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchShadowOwnerTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java

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


  Commit: 8bc5c7ad387b7f7831967bad868b7955cb612350
      https://github.com/Evolveum/midpoint/commit/8bc5c7ad387b7f7831967bad868b7955cb612350
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/BrowserPopupPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/BrowserPopupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ComboPopupPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ComboPopupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/DisplayableRenderer.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFragmentBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPopupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/TextPopupPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/TextPopupPanel.java

  Log Message:
  -----------
  search panel cleanup


  Commit: 781b74138db8b1d056fa19450a5e910d8d9f308a
      https://github.com/Evolveum/midpoint/commit/781b74138db8b1d056fa19450a5e910d8d9f308a
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.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-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.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/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/search-lookup


  Commit: d89c3a127d6b41c791a0818272cdd8f467be13b3
      https://github.com/Evolveum/midpoint/commit/d89c3a127d6b41c791a0818272cdd8f467be13b3
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M testing/conntest/src/test/resources/389ds/resource-dn-localhost.xml
    M testing/conntest/src/test/resources/389ds/resource-nsuniqueid-bacchus.xml
    M testing/conntest/src/test/resources/389ds/resource-nsuniqueid-localhost.xml

  Log Message:
  -----------
  Fixed missing employeeType mapping in 389ds conntests


  Commit: 57ff5bc6631afdf7a643ae318991a1e65dc89287
      https://github.com/Evolveum/midpoint/commit/57ff5bc6631afdf7a643ae318991a1e65dc89287
  Author: Martin Lízner <martin.lizner at gmail.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Travis - config cleanup


  Commit: dd30b183d2a3c0e6ef215075945a5875b940ec76
      https://github.com/Evolveum/midpoint/commit/dd30b183d2a3c0e6ef215075945a5875b940ec76
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M testing/conntest/src/test/resources/389ds/resource-nsuniqueid-bacchus.xml

  Log Message:
  -----------
  Removing matching rules from 389ds conntest. The connector should supply them.


  Commit: 8a4b1752a58760da62e82ad2bf55d2f3e58a0ee0
      https://github.com/Evolveum/midpoint/commit/8a4b1752a58760da62e82ad2bf55d2f3e58a0ee0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M .travis.yml

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


  Commit: 20fb7959b94bc476e21791efec9a325e3241200a
      https://github.com/Evolveum/midpoint/commit/20fb7959b94bc476e21791efec9a325e3241200a
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/TextPopupPanel.java

  Log Message:
  -----------
  autocomplete support in search panel


  Commit: bc0ace5d1f80701bdab6c83a974b01943a04beba
      https://github.com/Evolveum/midpoint/commit/bc0ace5d1f80701bdab6c83a974b01943a04beba
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  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/component/assignment/MultipleAssignmentSelector.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/configuration/PageDebugList.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/ResourceContentRepositoryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java

  Log Message:
  -----------
  model interaction service now used in search factory


  Commit: 6c3238bfffc95ab2c103348c55d6e803bc9e6820
      https://github.com/Evolveum/midpoint/commit/6c3238bfffc95ab2c103348c55d6e803bc9e6820
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java

  Log Message:
  -----------
  code cleanup


  Commit: a25e8bce163791be9c8ed41ef4bc8eec3a017afb
      https://github.com/Evolveum/midpoint/commit/a25e8bce163791be9c8ed41ef4bc8eec3a017afb
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M .travis.yml
    M testing/conntest/src/test/resources/389ds/resource-dn-localhost.xml
    M testing/conntest/src/test/resources/389ds/resource-nsuniqueid-bacchus.xml
    M testing/conntest/src/test/resources/389ds/resource-nsuniqueid-localhost.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/search-lookup


  Commit: 37603a569a31cf719eccd3f04c6c02a44522a846
      https://github.com/Evolveum/midpoint/commit/37603a569a31cf719eccd3f04c6c02a44522a846
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/BreakMode.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAccount.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyOrg.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestDependencies.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMappingInbound.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelCrudService.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/TestPassword.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuidNonUniqueName.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java

  Log Message:
  -----------
  Trying to reproduce MID-2134 using schema violation and simplified case. Not successful.


  Commit: aae241d00051ca535c66f8d8de9ae9e6e002d313
      https://github.com/Evolveum/midpoint/commit/aae241d00051ca535c66f8d8de9ae9e6e002d313
  Author: Petr Gašparík <petr.gasparik at ami.cz>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M .tx/config
    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_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.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
    A infra/schema/src/main/resources/localization/schema_cs.properties
    A infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    A infra/schema/src/main/resources/localization/schema_es.properties
    A infra/schema/src/main/resources/localization/schema_es_AR.properties
    A infra/schema/src/main/resources/localization/schema_et.properties
    A infra/schema/src/main/resources/localization/schema_hi.properties
    A infra/schema/src/main/resources/localization/schema_hu.properties
    A infra/schema/src/main/resources/localization/schema_pt_BR.properties
    A infra/schema/src/main/resources/localization/schema_ru.properties
    A infra/schema/src/main/resources/localization/schema_sk.properties
    A infra/schema/src/main/resources/localization/schema_tr.properties

  Log Message:
  -----------
  Localization files are split into two language files.
Translations arealso split since this commit.


Compare: https://github.com/Evolveum/midpoint/compare/a707d5c8b354...aae241d00051


More information about the midPoint-svn mailing list