[midPoint-git] [Evolveum/midpoint] 223c45: Hopefully fixing unreliable test

[Erik Suta]

  Branch: refs/heads/gui-devel
  Home:   https://github.com/Evolveum/midpoint
  Commit: 223c456dd0d22ac5ace6f2f471dd3b22064f8b4c
      https://github.com/Evolveum/midpoint/commit/223c456dd0d22ac5ace6f2f471dd3b22064f8b4c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.xml

  Log Message:
  -----------
  Hopefully fixing unreliable test


  Commit: ff39101cb19aefaffd007514d73579af63735b44
      https://github.com/Evolveum/midpoint/commit/ff39101cb19aefaffd007514d73579af63735b44
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java

  Log Message:
  -----------
  Custom task category


  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


  Commit: 1bb5520877975879d6b8e72dd06203619e33b3e8
      https://github.com/Evolveum/midpoint/commit/1bb5520877975879d6b8e72dd06203619e33b3e8
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-07-10 (Thu, 10 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/AddCapabilityDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityStepDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest2.java

  Log Message:
  -----------
  MID-1730 - CapabilityEditor implementation, hopefully finished.


  Commit: 8c2933048701f5e0a3c6e04000871f364b638451
      https://github.com/Evolveum/midpoint/commit/8c2933048701f5e0a3c6e04000871f364b638451
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-07-10 (Thu, 10 Jul 2014)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    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' into gui-devel


Compare: https://github.com/Evolveum/midpoint/compare/92d80c34de12...8c2933048701