[midPoint-git] [Evolveum/midpoint] 88ce94: Tentative fix for MID-1972 ($thisObject/name probl...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 88ce940415207ff37396c6e03273e2be343fa73b
      https://github.com/Evolveum/midpoint/commit/88ce940415207ff37396c6e03273e2be343fa73b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java

  Log Message:
  -----------
  Tentative fix for MID-1972 ($thisObject/name problem)


  Commit: 7931dfc64088822b4fa54bc37550a8c8c7f06d54
      https://github.com/Evolveum/midpoint/commit/7931dfc64088822b4fa54bc37550a8c8c7f06d54
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M infra/ws-util/src/main/java/com/evolveum/midpoint/infra/wsutil/AbstractWebServiceClient.java
    A infra/ws-util/src/main/resources/META-INF/cxf/org.apache.cxf.Logger
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/PasswordCallback.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.xml
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java

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


Compare: https://github.com/Evolveum/midpoint/compare/ff39101cb19a...7931dfc64088