[midPoint-git] [Evolveum/midpoint] 6a0e0e: Fixing model-intest contexts.

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6a0e0eed04dbdd5a582da5c401d78d847a2d2ada
      https://github.com/Evolveum/midpoint/commit/6a0e0eed04dbdd5a582da5c401d78d847a2d2ada
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M model/model-intest/src/test/resources/ctx-model-intest-test-main.xml

  Log Message:
  -----------
  Fixing model-intest contexts.


  Commit: e07c92ae6439386577d370c6799223780000d13f
      https://github.com/Evolveum/midpoint/commit/e07c92ae6439386577d370c6799223780000d13f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M model/model-intest/src/test/resources/ctx-model-intest-test-main.xml

  Log Message:
  -----------
  Fixing intest spring config


  Commit: d5ef5c8d8810aa2356c405b733dccd368f760627
      https://github.com/Evolveum/midpoint/commit/d5ef5c8d8810aa2356c405b733dccd368f760627
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
    M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    M gui/admin-gui/src/main/resources/initial-objects/108-report-user-orgs.xml
    M gui/admin-gui/src/main/resources/initial-objects/109-report-user-roles.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ObjectDeltaType.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java

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


Compare: https://github.com/Evolveum/midpoint/compare/f37472f44034...d5ef5c8d8810