[midPoint-git] [Evolveum/midpoint] 003b1a: MID-1951 in progress.

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 003b1addbe833442cc5e417d1792d832e26a5fe3
      https://github.com/Evolveum/midpoint/commit/003b1addbe833442cc5e417d1792d832e26a5fe3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/ConsistencyCheckScope.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java

  Log Message:
  -----------
  MID-1951 in progress.


  Commit: 1869061e95018ecfae1fc717b91633d3557ff843
      https://github.com/Evolveum/midpoint/commit/1869061e95018ecfae1fc717b91633d3557ff843
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java

  Log Message:
  -----------
  MID-2058, in progress


  Commit: 575706b82cd1047d984cf1c5ee415c3ff6fb4bd3
      https://github.com/Evolveum/midpoint/commit/575706b82cd1047d984cf1c5ee415c3ff6fb4bd3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/ConsistencyCheckScope.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java

  Log Message:
  -----------
  Merge branch 'master' of x:\midpoint


  Commit: 75d6aeea6bd066b4b75a76c06825a0f57ff74c8d
      https://github.com/Evolveum/midpoint/commit/75d6aeea6bd066b4b75a76c06825a0f57ff74c8d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-10-15 (Wed, 15 Oct 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ConsistencyCheckScope.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.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/importer/ObjectImporter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ContextFactory.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ObjectDeltaWaves.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    A repo/repo-sql-impl-test/src/test/resources/basic/user-same-ids.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java

  Log Message:
  -----------
  MID-1951 (checking for duplicate IDs on containers).


  Commit: 864be46f4d85857fbd2e7fa756c51335c25c0e52
      https://github.com/Evolveum/midpoint/commit/864be46f4d85857fbd2e7fa756c51335c25c0e52
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-10-15 (Wed, 15 Oct 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
    A testing/story/src/test/resources/schema/science.xsd
    A testing/story/src/test/resources/science/group-stats.ldif
    A testing/story/src/test/resources/science/resource-dummy-stats.xml
    A testing/story/src/test/resources/science/resource-dummy-unix.xml
    A testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml
    A testing/story/src/test/resources/science/role-statistics.xml
    M testing/story/src/test/resources/trafo/resource-dummy-ad.xml
    M testing/story/src/test/resources/trafo/role-employee.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/bf6692e734da...864be46f4d85