[midPoint-git] [Evolveum/midpoint] 5adcab: Fixed compilation errors in story and longtest. Pa...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 5adcabcca1b3960cd173ccd65c8398fe8c96e284
      https://github.com/Evolveum/midpoint/commit/5adcabcca1b3960cd173ccd65c8398fe8c96e284
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
    M testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml

  Log Message:
  -----------
  Fixed compilation errors in story and longtest. Partially fixed TestScience.


  Commit: 55488e0a578e8a6974d75a65f6256d4a22628f89
      https://github.com/Evolveum/midpoint/commit/55488e0a578e8a6974d75a65f6256d4a22628f89
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

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


Compare: https://github.com/Evolveum/midpoint/compare/f33786014422...55488e0a578e