[midPoint-git] [Evolveum/midpoint] 01d037: Fixed workflow-impl tests.

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 01d0378440d77ece250a93054e95372c01b6db83
      https://github.com/Evolveum/midpoint/commit/01d0378440d77ece250a93054e95372c01b6db83
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-02-22 (Mon, 22 Feb 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/DeltaBuilder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/Job.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/JobController.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/JobCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/WfTaskUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/BaseGcpScenarioBean.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareChildOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareRootOperationTaskHandler.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    M model/workflow-impl/testng-integration.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

  Log Message:
  -----------
  Fixed workflow-impl tests.


  Commit: f1df20ac0e8dba7026f644059f21f10607cc5871
      https://github.com/Evolveum/midpoint/commit/f1df20ac0e8dba7026f644059f21f10607cc5871
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-02-22 (Mon, 22 Feb 2016)

  Changed paths:
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.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/ReconciliationProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    A model/model-intest/src/test/resources/entitlements/role-brute.xml
    A model/model-intest/src/test/resources/entitlements/role-thug.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
    M testing/story/src/test/resources/logback-test.xml
    M testing/story/src/test/resources/unix/resource-opendj.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/e42d915b7799...f1df20ac0e8d