[midPoint-git] [Evolveum/midpoint] a0ad7d: Fix task statistics aggregation (colliding IDs)

virgo47 noreply at github.com
Thu Apr 8 18:59:59 CEST 2021 

  Branch: refs/heads/tmp/virgo-devel
  Home:   https://github.com/Evolveum/midpoint
  Commit: a0ad7dc47c12a62f606d5a76be41c0ca489611a3
      https://github.com/Evolveum/midpoint/commit/a0ad7dc47c12a62f606d5a76be41c0ca489611a3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Containerable.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/CloneUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/IterativeTaskInformation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StructuredTaskProgress.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/SynchronizationInformation.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestStatisticsProcessing.java
    A infra/schema/src/test/resources/statistics/task-aggregation-child-1.xml
    A infra/schema/src/test/resources/statistics/task-aggregation-child-2.xml
    A infra/schema/src/test/resources/statistics/task-aggregation-root.xml
    M infra/schema/testng-unit.xml

  Log Message:
  -----------
  Fix task statistics aggregation (colliding IDs)

Here we introduce ID-safe cloning methods: Containerable#cloneWithoutId
and CloneUtil#cloneCollectionMembersWithoutIds, and use them for
statistics aggregation.

Note that these methods are temporary and unfinished, just addressing
this particular issue. More in the comments.

Should fix MID-6975.


  Commit: 2d1dcb950f57eb455542ea38719062f20a87eae8
      https://github.com/Evolveum/midpoint/commit/2d1dcb950f57eb455542ea38719062f20a87eae8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-intest/src/test/resources/iterative-tasks/task-buckets-multithreaded.xml
    M model/model-intest/src/test/resources/reporting/task-recompute-roles-multinode.xml
    M model/model-intest/src/test/resources/reporting/task-recompute-roles.xml
    M model/model-intest/src/test/resources/reporting/task-reconcile-dummy-interrupted-partitioned-multinode.xml
    M model/model-intest/src/test/resources/reporting/task-reconcile-dummy-interrupted-partitioned.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/StringWorkSegmentationStrategy.java
    M repo/task-quartz-impl/src/test/resources/work-buckets/task-125-0.xml
    M repo/task-quartz-impl/src/test/resources/work-buckets/task-130-0.xml

  Log Message:
  -----------
  Change boundary/position to start at 1

This is to align semantics of this property with other "index-like"
ones used in midPoint. All such properties start counting at 1,
only this one (because of Java/C/... influence) originally started at 0.

This commit fixes this.


  Commit: badfffc95b2ccac44b83a5739bd9ff7d20cbb3b2
      https://github.com/Evolveum/midpoint/commit/badfffc95b2ccac44b83a5739bd9ff7d20cbb3b2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeForQueryModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeForXmlModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PolyStringEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismContainerValueWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismReferenceValueWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProvisioningStatisticsLineDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProvisioningStatisticsOperationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPopupPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskOperationStatisticsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/IterationHelper.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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


  Commit: c0f2cb43edd81ea94105baabd80d60653480fd0c
      https://github.com/Evolveum/midpoint/commit/c0f2cb43edd81ea94105baabd80d60653480fd0c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M config/sql/mysql-upgrade-4.2-4.3-utf8mb4.sql
    M config/sql/mysql-upgrade-4.2-4.3.sql
    M config/sql/oracle-upgrade-4.2-4.3.sql
    M config/sql/postgresql-upgrade-4.2-4.3.sql
    M config/sql/sqlserver-upgrade-4.2-4.3.sql

  Log Message:
  -----------
  Add Quartz migration code to SQL scripts

The JobExecutor class was moved in the class hierarchy, so the Quartz
database has to be updated as well.

This resolves MID-6974.


  Commit: 820b4d66bd55fd0fae89a185c872273896849936
      https://github.com/Evolveum/midpoint/commit/820b4d66bd55fd0fae89a185c872273896849936
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuAuthzUtil.java

  Log Message:
  -----------
  comment temporary solution


  Commit: 6d34741d990c7c1d71397b1c60a62e63de84ccc6
      https://github.com/Evolveum/midpoint/commit/6d34741d990c7c1d71397b1c60a62e63de84ccc6
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  adding displayOrder to ActivationType


  Commit: 9de7472d8138968ed2d84015cd37c00c634fce8a
      https://github.com/Evolveum/midpoint/commit/9de7472d8138968ed2d84015cd37c00c634fce8a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M config/sql/mysql-upgrade-4.2-4.3-utf8mb4.sql
    M config/sql/mysql-upgrade-4.2-4.3.sql
    M config/sql/oracle-upgrade-4.2-4.3.sql
    M config/sql/postgresql-upgrade-4.2-4.3.sql
    M config/sql/sqlserver-upgrade-4.2-4.3.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PolyStringEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismReferenceValueWrapperImpl.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Containerable.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/CloneUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/IterativeTaskInformation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StructuredTaskProgress.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/SynchronizationInformation.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestStatisticsProcessing.java
    A infra/schema/src/test/resources/statistics/task-aggregation-child-1.xml
    A infra/schema/src/test/resources/statistics/task-aggregation-child-2.xml
    A infra/schema/src/test/resources/statistics/task-aggregation-root.xml
    M infra/schema/testng-unit.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/IterationHelper.java
    M model/model-intest/src/test/resources/iterative-tasks/task-buckets-multithreaded.xml
    M model/model-intest/src/test/resources/reporting/task-recompute-roles-multinode.xml
    M model/model-intest/src/test/resources/reporting/task-recompute-roles.xml
    M model/model-intest/src/test/resources/reporting/task-reconcile-dummy-interrupted-partitioned-multinode.xml
    M model/model-intest/src/test/resources/reporting/task-reconcile-dummy-interrupted-partitioned.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/StringWorkSegmentationStrategy.java
    M repo/task-quartz-impl/src/test/resources/work-buckets/task-125-0.xml
    M repo/task-quartz-impl/src/test/resources/work-buckets/task-130-0.xml

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


  Commit: 7ef0b54da08469e3e8a7c44c70c4d4db4ebeb04f
      https://github.com/Evolveum/midpoint/commit/7ef0b54da08469e3e8a7c44c70c4d4db4ebeb04f
  Author: lskublik <lskublik at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M gui/admin-gui/src/main/resources/static/js/midpoint-theme.js

  Log Message:
  -----------
  fix for alligment of search popup (MID-6964)


  Commit: 770200dc433a0bcde7aa5b2730b21dbbb62463a2
      https://github.com/Evolveum/midpoint/commit/770200dc433a0bcde7aa5b2730b21dbbb62463a2
  Author: lskublik <lskublik at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java

  Log Message:
  -----------
  fix message in gui for exception of parsing query without detail message (MID-6985)


  Commit: 59de8f20d0a5f2ecb584acdf723d63e196e7c4f2
      https://github.com/Evolveum/midpoint/commit/59de8f20d0a5f2ecb584acdf723d63e196e7c4f2
  Author: lskublik <lskublik at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M config/sql/mysql-upgrade-4.2-4.3-utf8mb4.sql
    M config/sql/mysql-upgrade-4.2-4.3.sql
    M config/sql/oracle-upgrade-4.2-4.3.sql
    M config/sql/postgresql-upgrade-4.2-4.3.sql
    M config/sql/sqlserver-upgrade-4.2-4.3.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeForQueryModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeForXmlModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PolyStringEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismContainerValueWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismReferenceValueWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProvisioningStatisticsLineDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProvisioningStatisticsOperationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPopupPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskOperationStatisticsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Containerable.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/CloneUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/IterativeTaskInformation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StructuredTaskProgress.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/SynchronizationInformation.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestStatisticsProcessing.java
    A infra/schema/src/test/resources/statistics/task-aggregation-child-1.xml
    A infra/schema/src/test/resources/statistics/task-aggregation-child-2.xml
    A infra/schema/src/test/resources/statistics/task-aggregation-root.xml
    M infra/schema/testng-unit.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/IterationHelper.java
    M model/model-intest/src/test/resources/iterative-tasks/task-buckets-multithreaded.xml
    M model/model-intest/src/test/resources/reporting/task-recompute-roles-multinode.xml
    M model/model-intest/src/test/resources/reporting/task-recompute-roles.xml
    M model/model-intest/src/test/resources/reporting/task-reconcile-dummy-interrupted-partitioned-multinode.xml
    M model/model-intest/src/test/resources/reporting/task-reconcile-dummy-interrupted-partitioned.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M pom.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/StringWorkSegmentationStrategy.java
    M repo/task-quartz-impl/src/test/resources/work-buckets/task-125-0.xml
    M repo/task-quartz-impl/src/test/resources/work-buckets/task-130-0.xml

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


  Commit: 82e0ccaec33bb0109bead465973947e8678337b2
      https://github.com/Evolveum/midpoint/commit/82e0ccaec33bb0109bead465973947e8678337b2
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java

  Log Message:
  -----------
  quick (not perfect) fix for MID-6984


  Commit: 586a18f499baae24d508a32eff382d72ee8e6cfd
      https://github.com/Evolveum/midpoint/commit/586a18f499baae24d508a32eff382d72ee8e6cfd
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M config/sql/mysql-upgrade-4.2-4.3-utf8mb4.sql
    M config/sql/mysql-upgrade-4.2-4.3.sql
    M config/sql/sqlserver-upgrade-4.2-4.3.sql

  Log Message:
  -----------
  MID-6974: case-sensitivity fixes for MySQL/Maria and SQL Server


  Commit: 30f20e80ac1b2fa9a4f6757b41c2ca2aca295cfe
      https://github.com/Evolveum/midpoint/commit/30f20e80ac1b2fa9a4f6757b41c2ca2aca295cfe
  Author: Tony Tkacik <tonydamage at gmail.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomQuerySource.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQueryLanguageParserImpl.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestBasicQueryConversions.java

  Log Message:
  -----------
  MID-6985: Added more helpful error messages to Query Language

Signed-off-by: Tony Tkacik <tonydamage at gmail.com>


  Commit: 5b598f369ca4568cdd214379c4b1bb2a352d1dad
      https://github.com/Evolveum/midpoint/commit/5b598f369ca4568cdd214379c4b1bb2a352d1dad
  Author: lskublik <lskublik at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java

  Log Message:
  -----------
  removing log for exception during writing of query


  Commit: afe21b080ef66594df8b3c7962104a2e3206e5b4
      https://github.com/Evolveum/midpoint/commit/afe21b080ef66594df8b3c7962104a2e3206e5b4
  Author: lskublik <lskublik at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M config/sql/mysql-upgrade-4.2-4.3-utf8mb4.sql
    M config/sql/mysql-upgrade-4.2-4.3.sql
    M config/sql/sqlserver-upgrade-4.2-4.3.sql
    M infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomQuerySource.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQueryLanguageParserImpl.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestBasicQueryConversions.java

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


  Commit: 97a3a87835ea512135385691c96c87778f57d036
      https://github.com/Evolveum/midpoint/commit/97a3a87835ea512135385691c96c87778f57d036
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M config/sql/mysql-upgrade-4.2-4.3-utf8mb4.sql
    M config/sql/mysql-upgrade-4.2-4.3.sql
    M config/sql/sqlserver-upgrade-4.2-4.3.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    M gui/admin-gui/src/main/resources/static/js/midpoint-theme.js
    M infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomQuerySource.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQueryLanguageParserImpl.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestBasicQueryConversions.java

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


  Commit: 65478fabd391a10987af043cbfb62209bc5ae0bf
      https://github.com/Evolveum/midpoint/commit/65478fabd391a10987af043cbfb62209bc5ae0bf
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  plannedRemoval=4.4


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuAuthzUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java
    M infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomQuerySource.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQueryLanguageParserImpl.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestBasicQueryConversions.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

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


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

  Changed paths:
    M config/sql/mysql-upgrade-4.2-4.3-utf8mb4.sql
    M config/sql/mysql-upgrade-4.2-4.3.sql
    M config/sql/oracle-upgrade-4.2-4.3.sql
    M config/sql/postgresql-upgrade-4.2-4.3.sql
    M config/sql/sqlserver-upgrade-4.2-4.3.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuAuthzUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java
    M gui/admin-gui/src/main/resources/static/js/midpoint-theme.js
    M infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomQuerySource.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Containerable.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/CloneUtil.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQueryLanguageParserImpl.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestBasicQueryConversions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/IterativeTaskInformation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StructuredTaskProgress.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/SynchronizationInformation.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestStatisticsProcessing.java
    A infra/schema/src/test/resources/statistics/task-aggregation-child-1.xml
    A infra/schema/src/test/resources/statistics/task-aggregation-child-2.xml
    A infra/schema/src/test/resources/statistics/task-aggregation-root.xml
    M infra/schema/testng-unit.xml
    M model/model-intest/src/test/resources/iterative-tasks/task-buckets-multithreaded.xml
    M model/model-intest/src/test/resources/reporting/task-recompute-roles-multinode.xml
    M model/model-intest/src/test/resources/reporting/task-recompute-roles.xml
    M model/model-intest/src/test/resources/reporting/task-reconcile-dummy-interrupted-partitioned-multinode.xml
    M model/model-intest/src/test/resources/reporting/task-reconcile-dummy-interrupted-partitioned.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/StringWorkSegmentationStrategy.java
    M repo/task-quartz-impl/src/test/resources/work-buckets/task-125-0.xml
    M repo/task-quartz-impl/src/test/resources/work-buckets/task-130-0.xml

  Log Message:
  -----------
  Merge branch 'master' into tmp/virgo-devel


Compare: https://github.com/Evolveum/midpoint/compare/5f20e67d11b2...f617e2074e0e

More information about the midPoint-svn mailing list