[midPoint-git] [Evolveum/midpoint] 8246bc: model-(in)test: cleanup and OID fixes

Mon Aug 16 11:35:46 CEST 2021

  Branch: refs/heads/feature/gui-config
  Home:   https://github.com/Evolveum/midpoint
  Commit: 8246bc8c18e53f0b1cb4262b1d3f21df37ad2a27
      https://github.com/Evolveum/midpoint/commit/8246bc8c18e53f0b1cb4262b1d3f21df37ad2a27
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-08-10 (Tue, 10 Aug 2021)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingChaining.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingInbound.java
    M model/model-intest/src/test/resources/common/role-admins.xml
    M model/model-intest/src/test/resources/common/role-autotesters.xml
    M model/model-intest/testng-integration-sqale.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java

  Log Message:
  -----------
  model-(in)test: cleanup and OID fixes

  Commit: aad7afc1226b5153c9e51c48c975db897a435b57
      https://github.com/Evolveum/midpoint/commit/aad7afc1226b5153c9e51c48c975db897a435b57
  Author: Tony Tkacik <tonydamage at gmail.com>
  Date:   2021-08-10 (Tue, 10 Aug 2021)

  Changed paths:
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSearchTest.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlQueryContext.java

  Log Message:
  -----------
  sqale: Added support for orderBy by nested items

Added preliminary support for nested ordering (contained containers)
such as metadata/*

  Commit: 83e70c1d3f33a04dfcb4ede3cb195d6d8489899c
      https://github.com/Evolveum/midpoint/commit/83e70c1d3f33a04dfcb4ede3cb195d6d8489899c
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-08-10 (Tue, 10 Aug 2021)

  Changed paths:
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/ContainerValueIdGenerator.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/AddObjectContext.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/RootUpdateContext.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoModifyObjectTest.java

  Log Message:
  -----------
  repo-sqale: ContainerValueIdGenerator can free replaced CIDs

This fixes many tests using REPLACE of containers with existing CIDs.

  Commit: f7cfcb12fbe2bfd776470cb797dfa85c371cb921
      https://github.com/Evolveum/midpoint/commit/f7cfcb12fbe2bfd776470cb797dfa85c371cb921
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-08-10 (Tue, 10 Aug 2021)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingAdvanced.java
    M model/model-intest/testng-integration-sqale.xml

  Log Message:
  -----------
  model-intest: few more tests are now working with new repo, few cleanups

  Commit: d9b9d90a95ff747b1ae3695a953e0ff8692e2fa0
      https://github.com/Evolveum/midpoint/commit/d9b9d90a95ff747b1ae3695a953e0ff8692e2fa0
  Author: kate <honchar at evolveum.com>
  Date:   2021-08-11 (Wed, 11 Aug 2021)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DirectAndIndirectAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java

  Log Message:
  -----------
  indirect construction assignment name fix

  Commit: 5e26545f0e5dbbac9b2a1c663029633cd366ebbc
      https://github.com/Evolveum/midpoint/commit/5e26545f0e5dbbac9b2a1c663029633cd366ebbc
  Author: Tony Tkacik <tonydamage at gmail.com>
  Date:   2021-08-11 (Wed, 11 Aug 2021)

  Changed paths:
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSearchTest.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlQueryContext.java

  Log Message:
  -----------
  sqale: Added todos to path resolution.

  Commit: 3a7ab286be64ce9b4af434718241c7bc5a1c6745
      https://github.com/Evolveum/midpoint/commit/3a7ab286be64ce9b4af434718241c7bc5a1c6745
  Author: Tony Tkacik <tonydamage at gmail.com>
  Date:   2021-08-11 (Wed, 11 Aug 2021)

  Changed paths:
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/ExtensionItemSqlMapper.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/ExtensionMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/SqaleTableMapping.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSearchTest.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlQueryContext.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/DefaultItemSqlMapper.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/ItemSqlMapper.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/QueryTableMapping.java

  Log Message:
  -----------
  sqale: Added support for orderBy extension item

  Commit: b448fb53a8b91872427e4654d15384074c351806
      https://github.com/Evolveum/midpoint/commit/b448fb53a8b91872427e4654d15384074c351806
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-08-11 (Wed, 11 Aug 2021)

  Changed paths:
    M model/model-intest/testng-integration-sqale.xml
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/SqaleTableMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/RootUpdateContext.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlRepoContext.java

  Log Message:
  -----------
  repo-sqale: added relation normalization for addObjects

This also fixes audit delta count mismatch in TestIteration.

  Commit: bea915bbc307421c3331f7210c23817912a5606d
      https://github.com/Evolveum/midpoint/commit/bea915bbc307421c3331f7210c23817912a5606d
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-08-11 (Wed, 11 Aug 2021)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java
    M model/model-intest/testng-integration-sqale.xml
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/DelegatingItemDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/RefItemDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/RefTableItemDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/SqaleItemRelationResolver.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/SqaleTableMapping.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoAddDeleteObjectTest.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoModifyObjectTest.java

  Log Message:
  -----------
  repo-sqale: fixed default ref type from definition for modify/addObject

Previously only ext refs had this fixed, now it's fixed for all refs.
We don't want null ref target types in repo.

  Commit: b4080492d1d7e704b304d0ade79776269e18a919
      https://github.com/Evolveum/midpoint/commit/b4080492d1d7e704b304d0ade79776269e18a919
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-08-11 (Wed, 11 Aug 2021)

  Changed paths:
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/ExtensionItemDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/FinalValueDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/ContainerTableRelationResolver.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/accesscert/QAccessCertificationCaseMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/RootUpdateContext.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/SqaleUpdateContext.java

  Log Message:
  -----------
  repo-sqale: update context findItem() changed to findValueOrItem()

Now it can also obtain PCVs by their path and check whether they are
even available when modified which now throws better exception, not NPE.

  Commit: 647f737560686fe6393f9e3929b6d07d5bed2488
      https://github.com/Evolveum/midpoint/commit/647f737560686fe6393f9e3929b6d07d5bed2488
  Author: kate <honchar at evolveum.com>
  Date:   2021-08-12 (Thu, 12 Aug 2021)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java

  Log Message:
  -----------
  object display name usage in the case name

  Commit: 049ea878dc132d11f5f54987bfb1a55e19130a15
      https://github.com/Evolveum/midpoint/commit/049ea878dc132d11f5f54987bfb1a55e19130a15
  Author: kate <honchar at evolveum.com>
  Date:   2021-08-12 (Thu, 12 Aug 2021)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingAdvanced.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingChaining.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingInbound.java
    M model/model-intest/src/test/resources/common/role-admins.xml
    M model/model-intest/src/test/resources/common/role-autotesters.xml
    M model/model-intest/testng-integration-sqale.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/ContainerValueIdGenerator.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/DelegatingItemDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/ExtensionItemDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/FinalValueDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/RefItemDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/RefTableItemDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/ContainerTableRelationResolver.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/SqaleItemRelationResolver.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/SqaleTableMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/accesscert/QAccessCertificationCaseMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/AddObjectContext.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/RootUpdateContext.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/SqaleUpdateContext.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoAddDeleteObjectTest.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoModifyObjectTest.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlRepoContext.java

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

  Commit: ac3420f32604c5c9e99ee98d2c73f6d98fccabed
      https://github.com/Evolveum/midpoint/commit/ac3420f32604c5c9e99ee98d2c73f6d98fccabed
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-08-12 (Thu, 12 Aug 2021)

  Changed paths:
    M model/model-intest/testng-integration-sqale.xml
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java

  Log Message:
  -----------
  repo-sqale: fix of optional getObject, fixes few org tests

  Commit: 9fde0ba2d2623595e19b823965265eb27828dfa0
      https://github.com/Evolveum/midpoint/commit/9fde0ba2d2623595e19b823965265eb27828dfa0
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-08-12 (Thu, 12 Aug 2021)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java

  Log Message:
  -----------
  TaskManagerQuartzImpl: autowires DataSource instead of DSFactory

  Commit: 48a04ec8904115ca7ed137946f429d5d64888153
      https://github.com/Evolveum/midpoint/commit/48a04ec8904115ca7ed137946f429d5d64888153
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-08-12 (Thu, 12 Aug 2021)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/quartz/QuartzInitializationHelper.java

  Log Message:
  -----------
  QuartzInitializationHelper: autowires DataSource instead of beanFactory

  Commit: 21d63a2428db31ec736c48c72340e1ad70b67faf
      https://github.com/Evolveum/midpoint/commit/21d63a2428db31ec736c48c72340e1ad70b67faf
  Author: Tony Tkacik <tonydamage at gmail.com>
  Date:   2021-08-13 (Fri, 13 Aug 2021)

  Changed paths:
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ExportConsumerWorker.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/ExportOptions.java
    M tools/ninja/src/main/resources/messages.properties

  Log Message:
  -----------
  ninja: Added support for export without container ids

  Commit: 062489672ac248c24bcb90113044030eca73b6da
      https://github.com/Evolveum/midpoint/commit/062489672ac248c24bcb90113044030eca73b6da
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-08-13 (Fri, 13 Aug 2021)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/testng-integration-sqale.xml
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/ContainerValueIdGenerator.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/ContainerTableDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/RootUpdateContext.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/SqaleUpdateContext.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoModifyObjectTest.java

  Log Message:
  -----------
  repo-sqale: fix of duplicate container creation, fixes many intests

Now ContainerValueIdGenerator tracks containers that should be
overwritten by ADD modification because have the same real value
(REAL_VALUE_CONSIDER_DIFFERENT_IDS).

  Commit: dee9c16172bb5936f38543df045561c79666fbf1
      https://github.com/Evolveum/midpoint/commit/dee9c16172bb5936f38543df045561c79666fbf1
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-08-13 (Fri, 13 Aug 2021)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/misc/TestMisc.java
    M model/model-intest/testng-integration-sqale.xml
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/filtering/ExtensionItemFilterProcessor.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSearchTest.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/item/PolyStringItemFilterProcessor.java

  Log Message:
  -----------
  repo-sqale: fix of normalized poly query, normalizes provided value too

This also fixes intest TestMisc.

  Commit: 6b857dbba02503c902bc551f3d5b4c3ee24a6542
      https://github.com/Evolveum/midpoint/commit/6b857dbba02503c902bc551f3d5b4c3ee24a6542
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-08-13 (Fri, 13 Aug 2021)

  Changed paths:
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/SqaleTableMapping.java

  Log Message:
  -----------
  repo-sqale: better exception for unconvertable OID/UUID

  Commit: c1ba83b02f5e608a82fb12bbae9106c969b45fd7
      https://github.com/Evolveum/midpoint/commit/c1ba83b02f5e608a82fb12bbae9106c969b45fd7
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-08-13 (Fri, 13 Aug 2021)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestArchetypeInheritance.java
    M model/model-intest/src/test/resources/archetypes/archetype-recon-task.xml
    M model/model-intest/testng-integration-sqale.xml

  Log Message:
  -----------
  TestArchetypeInheritance fixes, OIDs, non-unique archetype name, cleanup

  Commit: 6e4b63c9a2648b5a410cc349c825d0d4e7b3a1b7
      https://github.com/Evolveum/midpoint/commit/6e4b63c9a2648b5a410cc349c825d0d4e7b3a1b7
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-08-13 (Fri, 13 Aug 2021)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestFunctions.java
    M model/model-intest/testng-integration-sqale.xml

  Log Message:
  -----------
  TestFunctions: fix, even nonexistent OID must be UUID

  Commit: ed877cd3485647a91079fa87bd34b84e868ab306
      https://github.com/Evolveum/midpoint/commit/ed877cd3485647a91079fa87bd34b84e868ab306
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-08-13 (Fri, 13 Aug 2021)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
    M model/model-intest/testng-integration-sqale.xml
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java

  Log Message:
  -----------
  model-intest: few more tests new repo ready, TestUuid cleanup

  Commit: a417e33b446603c44537f62e4315467c1fce900c
      https://github.com/Evolveum/midpoint/commit/a417e33b446603c44537f62e4315467c1fce900c
  Author: Tony Tkacik <tonydamage at gmail.com>
  Date:   2021-08-16 (Mon, 16 Aug 2021)

  Changed paths:
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/ExtensionItemSqlMapper.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/ExtensionMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/SqaleTableMapping.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSearchTest.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlQueryContext.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/DefaultItemSqlMapper.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/ItemSqlMapper.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/QueryTableMapping.java

  Log Message:
  -----------
  Merge branch 'feature/repo-order-by-paths'

  Commit: d663b0b04174746e1e0b9c52e72ec12b2a511ac9
      https://github.com/Evolveum/midpoint/commit/d663b0b04174746e1e0b9c52e72ec12b2a511ac9
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2021-08-16 (Mon, 16 Aug 2021)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DirectAndIndirectAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestFunctions.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestArchetypeInheritance.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingAdvanced.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingChaining.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingInbound.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/misc/TestMisc.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
    M model/model-intest/src/test/resources/archetypes/archetype-recon-task.xml
    M model/model-intest/src/test/resources/common/role-admins.xml
    M model/model-intest/src/test/resources/common/role-autotesters.xml
    M model/model-intest/testng-integration-sqale.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/ContainerValueIdGenerator.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/DelegatingItemDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/ContainerTableDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/ExtensionItemDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/FinalValueDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/RefItemDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/RefTableItemDeltaProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/filtering/ExtensionItemFilterProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/ContainerTableRelationResolver.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/ExtensionItemSqlMapper.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/ExtensionMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/SqaleItemRelationResolver.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/SqaleTableMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/accesscert/QAccessCertificationCaseMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/AddObjectContext.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/RootUpdateContext.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/SqaleUpdateContext.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoAddDeleteObjectTest.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoModifyObjectTest.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSearchTest.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlQueryContext.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlRepoContext.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/item/PolyStringItemFilterProcessor.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/DefaultItemSqlMapper.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/ItemSqlMapper.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/QueryTableMapping.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/quartz/QuartzInitializationHelper.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ExportConsumerWorker.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/ExportOptions.java
    M tools/ninja/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/gui-config

# Conflicts:
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DirectAndIndirectAssignmentPanel.java

Compare: https://github.com/Evolveum/midpoint/compare/63b4b8a8f8ac...d663b0b04174