[midPoint-git] [Evolveum/midpoint] 548377: MID-2730 repository datasource loading fix

[Viliam Repan]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 548377009686a53695c233c6ccec225d489ce803
      https://github.com/Evolveum/midpoint/commit/548377009686a53695c233c6ccec225d489ce803
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-11-27 (Fri, 27 Nov 2015)

  Changed paths:
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-session.xml
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/CompositeDataSource.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java
    M repo/repo-sql-impl/src/main/resources/ctx-repository-session.xml

  Log Message:
  -----------
  MID-2730 repository datasource loading fix


  Commit: 26bd286a49ff40bdec5c0eb1d66e594d6ef48ac8
      https://github.com/Evolveum/midpoint/commit/26bd286a49ff40bdec5c0eb1d66e594d6ef48ac8
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-11-27 (Fri, 27 Nov 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
    M testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/f944e1f3c026...26bd286a49ff