[midPoint-git] [Evolveum/midpoint] 393118: Fixing test spring contexts

[Radovan Semancik]

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

  Changed paths:
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestCleanStartup.java
    M gui/admin-gui/src/test/resources/ctx-test.xml

  Log Message:
  -----------
  Fixing test spring contexts


  Commit: 4e977396f5b8ab15b7ddf1065a7f1c6de2104cef
      https://github.com/Evolveum/midpoint/commit/4e977396f5b8ab15b7ddf1065a7f1c6de2104cef
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AceEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.properties
    M gui/admin-gui/src/main/webapp/js/midpoint/ace-editor.js

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


Compare: https://github.com/Evolveum/midpoint/compare/026c90d1d86a...4e977396f5b8