[midPoint-git] [Evolveum/midpoint] 5edc6d: Tentative fix for MID-3706: in reconcile task with...

[Pavol Mederly]

  Branch: refs/heads/support-3.5
  Home:   https://github.com/Evolveum/midpoint
  Commit: 5edc6d76f9096d9b25de6cf15650e22b97b324e3
      https://github.com/Evolveum/midpoint/commit/5edc6d76f9096d9b25de6cf15650e22b97b324e3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

  Log Message:
  -----------
  Tentative fix for MID-3706: in reconcile task with more then 1 workerThreads dry run option is ignored

(cherry picked from commit c9b08ac)


  Commit: c302810f909bf07d2da8760901ff22e031bb12e2
      https://github.com/Evolveum/midpoint/commit/c302810f909bf07d2da8760901ff22e031bb12e2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.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/component/schemahandling/ResourceActivationEditor.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/self/PageAbstractSelfCredentials.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/DefaultMatchingRule.java
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseResource.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-common/pom.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ValueSetDefinition.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/ReferenceSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
    A model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDomain.java
    A model/model-common/src/test/resources/mapping/mapping-domain.xml
    M model/model-common/testng-unit.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/DataModelVisualizerImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.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/AssignmentProcessor.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/validator/ResourceValidatorImpl.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
    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/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/common/resource-dummy-red.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/object-template/role-autocratic.xml
    A model/model-intest/src/test/resources/object-template/role-autodidactic.xml
    A model/model-intest/src/test/resources/object-template/role-autographic.xml
    A model/model-intest/src/test/resources/object-template/role-automatic.xml
    A model/model-intest/src/test/resources/rbac/role-weak-singer.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java
    M samples/model-client-sample/pom.xml
    M testing/story/pom.xml
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    A testing/story/src/test/resources/machineintelligence/HR.csv
    A testing/story/src/test/resources/machineintelligence/resource-csv-HR.xml
    A testing/story/src/test/resources/machineintelligence/shadow-chappie.xml
    A testing/story/src/test/resources/machineintelligence/shadow-rur.xml
    M testing/story/testng-integration.xml
    M tools/repo-ninja/pom.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/support-3.5' into support-3.5


Compare: https://github.com/Evolveum/midpoint/compare/84411ee9ad3c...c302810f909b