[midPoint-git] [Evolveum/midpoint] a9a3fc: Come XML cleanup

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: a9a3fc4fda153f429bb939314ce2a09922e6e8ce
      https://github.com/Evolveum/midpoint/commit/a9a3fc4fda153f429bb939314ce2a09922e6e8ce
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-04-17 (Thu, 17 Apr 2014)

  Changed paths:
    M model/model-intest/src/test/resources/common/resource-dummy-red.xml
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/common/role-judge.xml
    M model/model-intest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Come XML cleanup


  Commit: 880d4f6dbf77add9f01889e1d7a944ffb2fe942b
      https://github.com/Evolveum/midpoint/commit/880d4f6dbf77add9f01889e1d7a944ffb2fe942b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-04-17 (Thu, 17 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    M infra/schema/src/test/resources/common/role-construction.xml
    M infra/schema/src/test/resources/common/user-jack.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  More delta tests, fixing removal of wrong container in delta applyTo


  Commit: 4b420b4bb36142928f46bc02a59ab68334ecc5da
      https://github.com/Evolveum/midpoint/commit/4b420b4bb36142928f46bc02a59ab68334ecc5da
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-04-17 (Thu, 17 Apr 2014)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/SimpleErrorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/SimpleErrorPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/SimpleErrorPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/UserAccountDto.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    A repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/DBValidator.java
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java
    A repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java

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


  Commit: 7dc79cd5a0b491614fb73ed726e22eb00d2cdbfa
      https://github.com/Evolveum/midpoint/commit/7dc79cd5a0b491614fb73ed726e22eb00d2cdbfa
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-04-17 (Thu, 17 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java

  Log Message:
  -----------
  post-merge fix


Compare: https://github.com/Evolveum/midpoint/compare/ebf829a3e1b6...7dc79cd5a0b4