[midPoint-git] [Evolveum/midpoint] 20c030: MID-4112: Resolution of conflicts arising during c...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 20c030222a9fc2420dcb7d0f61379df2c84c252a
      https://github.com/Evolveum/midpoint/commit/20c030222a9fc2420dcb7d0f61379df2c84c252a
  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


  Commit: 4927ad4439377cb5a0f1c58a4b72b5393e51ba05
      https://github.com/Evolveum/midpoint/commit/4927ad4439377cb5a0f1c58a4b72b5393e51ba05
  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


  Commit: 571efa77c886983313fa85424018671781600bd7
      https://github.com/Evolveum/midpoint/commit/571efa77c886983313fa85424018671781600bd7
  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.


Compare: https://github.com/Evolveum/midpoint/compare/c86a3e8e64c0...571efa77c886