[midPoint-git] [Evolveum/midpoint] 02eea1: Replicating MID-2368 in test

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 02eea1810f9ccb6e413e5d20e73041aeba0a46c8
      https://github.com/Evolveum/midpoint/commit/02eea1810f9ccb6e413e5d20e73041aeba0a46c8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

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

  Log Message:
  -----------
  Replicating MID-2368 in test


  Commit: a0bf0d22c609b575027a4eed10fedd14788022bb
      https://github.com/Evolveum/midpoint/commit/a0bf0d22c609b575027a4eed10fedd14788022bb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanInspector.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbParsing.java
    A infra/schema/src/test/resources/common/value-filter-with-any.xml

  Log Message:
  -----------
  Merge branch 'master' into MID-2368

explain why this merge is necessary,


  Commit: e99dde16d3416f8c5c63c311aa0080538edd700a
      https://github.com/Evolveum/midpoint/commit/e99dde16d3416f8c5c63c311aa0080538edd700a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
    M model/model-intest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Not replicating MID-2368 in TestEntitlements


  Commit: 508b845af94a69e1d61b4d27920b0189889e5932
      https://github.com/Evolveum/midpoint/commit/508b845af94a69e1d61b4d27920b0189889e5932
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java

  Log Message:
  -----------
  Not replicating MID-2368 in TestOrgSync


  Commit: 6a654fc7a369586839d5c717eebc61ae67ee583b
      https://github.com/Evolveum/midpoint/commit/6a654fc7a369586839d5c717eebc61ae67ee583b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
    M model/model-intest/src/test/resources/logback-test.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java

  Log Message:
  -----------
  Merge branch 'MID-2368'


Compare: https://github.com/Evolveum/midpoint/compare/0d6a4610ee1c...6a654fc7a369