[midPoint-git] [Evolveum/midpoint] 4c7cda: Adapted TestLoggingConfiguration.

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 4c7cdaf27097ebfbef4c4e76fbc3f407d7d321c7
      https://github.com/Evolveum/midpoint/commit/4c7cdaf27097ebfbef4c4e76fbc3f407d7d321c7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java

  Log Message:
  -----------
  Adapted TestLoggingConfiguration.


  Commit: 8ef4bfe9cb0e0286082ff5de76978613afada9e8
      https://github.com/Evolveum/midpoint/commit/8ef4bfe9cb0e0286082ff5de76978613afada9e8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointXmlProvider.java
    M testing/rest/pom.xml
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestProvider.java
    R testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceJson.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceXml.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceYaml.java
    M testing/rest/src/test/resources/ctx-rest-test-main.xml
    M testing/rest/src/test/resources/logback-test.xml
    R testing/rest/src/test/resources/repo/account-chuck.xml
    A testing/rest/src/test/resources/repo/json/account-chuck.json
    A testing/rest/src/test/resources/repo/json/role-adder.json
    A testing/rest/src/test/resources/repo/json/role-modifier.json
    A testing/rest/src/test/resources/repo/json/user-darthadder.json
    A testing/rest/src/test/resources/repo/json/user-nopassword.json
    A testing/rest/src/test/resources/repo/json/user-template.json
    R testing/rest/src/test/resources/repo/role-adder.xml
    R testing/rest/src/test/resources/repo/role-modifier.xml
    R testing/rest/src/test/resources/repo/user-darthadder.xml
    R testing/rest/src/test/resources/repo/user-nopassword.xml
    R testing/rest/src/test/resources/repo/user-template.xml
    A testing/rest/src/test/resources/repo/xml/account-chuck.xml
    A testing/rest/src/test/resources/repo/xml/role-adder.xml
    A testing/rest/src/test/resources/repo/xml/role-modifier.xml
    A testing/rest/src/test/resources/repo/xml/user-darthadder.xml
    A testing/rest/src/test/resources/repo/xml/user-nopassword.xml
    A testing/rest/src/test/resources/repo/xml/user-template.xml
    A testing/rest/src/test/resources/repo/yaml/account-chuck.yml
    A testing/rest/src/test/resources/repo/yaml/role-adder.yml
    A testing/rest/src/test/resources/repo/yaml/role-modifier.yml
    A testing/rest/src/test/resources/repo/yaml/user-darthadder.yml
    A testing/rest/src/test/resources/repo/yaml/user-nopassword.yml
    A testing/rest/src/test/resources/repo/yaml/user-template.yml
    A testing/rest/src/test/resources/req/json/modification-assign-role-modifier.json
    A testing/rest/src/test/resources/req/json/modification-disable.json
    A testing/rest/src/test/resources/req/json/modification-enable.json
    R testing/rest/src/test/resources/req/modification-assign-role-modifier.xml
    R testing/rest/src/test/resources/req/modification-disable.xml
    R testing/rest/src/test/resources/req/modification-enable.xml
    A testing/rest/src/test/resources/req/xml/modification-assign-role-modifier.xml
    A testing/rest/src/test/resources/req/xml/modification-disable.xml
    A testing/rest/src/test/resources/req/xml/modification-enable.xml
    A testing/rest/src/test/resources/req/yaml/modification-assign-role-modifier.yml
    A testing/rest/src/test/resources/req/yaml/modification-disable.yml
    A testing/rest/src/test/resources/req/yaml/modification-enable.yml
    M testing/rest/testng-integration.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


Compare: https://github.com/Evolveum/midpoint/compare/0af0a7c9f00a...8ef4bfe9cb0e