[midPoint-git] [Evolveum/midpoint] 4aa378: Small enhancement to a parsing error message.

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 4aa3782e5add773ee2d934b1f46d97f0f48f5bd3
      https://github.com/Evolveum/midpoint/commit/4aa3782e5add773ee2d934b1f46d97f0f48f5bd3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java

  Log Message:
  -----------
  Small enhancement to a parsing error message.


  Commit: f55cd2aa0931f61c78c4f610a3040831262c2bd6
      https://github.com/Evolveum/midpoint/commit/f55cd2aa0931f61c78c4f610a3040831262c2bd6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DeleteTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/sync/task-delete-dummy-shadows.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    R testing/longtest/src/test/resources/ldap/task-delete-dummy-shadows.xml
    A testing/longtest/src/test/resources/ldap/task-delete-opendj-shadows.xml
    M testing/longtest/src/test/resources/logback-test.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/5fb316fa6aa8...f55cd2aa0931