[midPoint-git] [Evolveum/midpoint] 76e521: Simple test for MID-4112

[Pavol Mederly]

  Branch: refs/heads/support-3.6
  Home:   https://github.com/Evolveum/midpoint
  Commit: 76e521346118b53be1fbfe0c10ccab6a52e3e485
      https://github.com/Evolveum/midpoint/commit/76e521346118b53be1fbfe0c10ccab6a52e3e485
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-18 (Fri, 18 Aug 2017)

  Changed paths:
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/DelayingProgressListener.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java

  Log Message:
  -----------
  Simple test for MID-4112

(cherry picked from commit 83ff825)


  Commit: 0bb78fa019af024fa7d25b63bc282790831ffb4a
      https://github.com/Evolveum/midpoint/commit/0bb78fa019af024fa7d25b63bc282790831ffb4a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-18 (Fri, 18 Aug 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_MaybeDelete.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ProgressInformation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelUtils.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/DelayingProgressListener.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.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/TestRecomputeTask.java
    M model/model-intest/testng-integration.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    A repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/ConflictWatcher.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/ConflictWatcherImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.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/AbstractIntegrationTest.java

  Log Message:
  -----------
  MID-4112: Resolution of conflicts arising during clockwork processing

(cherry picked from commit 20c0302)


  Commit: df01b1e2cfe410715c21966352435c7c7fa133ae
      https://github.com/Evolveum/midpoint/commit/df01b1e2cfe410715c21966352435c7c7fa133ae
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-18 (Fri, 18 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/DefaultGuiProgressListener.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ProgressInformation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java

  Log Message:
  -----------
  MID-4112: Fixing midpoint startup failure, fixing progress reporting, adjusting default retry parameters

(cherry picked from commit 4927ad4)


  Commit: 14d665314a03748db3311b3078cbb3476c75e816
      https://github.com/Evolveum/midpoint/commit/14d665314a03748db3311b3078cbb3476c75e816
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-18 (Fri, 18 Aug 2017)

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

  Log Message:
  -----------
  Some tests for conflict watchers.

(cherry picked from commit 571efa7)


  Commit: e06b13395dcbcb5a5edce72a1f2d14fd40bb0104
      https://github.com/Evolveum/midpoint/commit/e06b13395dcbcb5a5edce72a1f2d14fd40bb0104
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-18 (Fri, 18 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyConfigurationTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyDialogDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  MID-4112: adapting object template GUI to keep conflict resolution info untouched

(cherry picked from commit 64bac9a)


  Commit: 499177cd3092368d9e6621ad5f04f8d4c06b60ff
      https://github.com/Evolveum/midpoint/commit/499177cd3092368d9e6621ad5f04f8d4c06b60ff
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-18 (Fri, 18 Aug 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContextImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/DeltaBuilder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_ValuesEntry.java

  Log Message:
  -----------
  Minor prism enhancements.

(cherry picked from commit 2aa3234)


  Commit: beb52cee50b9f529c00daa19dc8ebb8480c00dbe
      https://github.com/Evolveum/midpoint/commit/beb52cee50b9f529c00daa19dc8ebb8480c00dbe
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-18 (Fri, 18 Aug 2017)

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

  Log Message:
  -----------
  Post-merge fixes.


Compare: https://github.com/Evolveum/midpoint/compare/fc77d56ce986...beb52cee50b9