[midPoint-git] [Evolveum/midpoint] c270c4: Add state reporting to async listening activities

Radovan Semancik noreply at github.com
Thu Mar 21 20:19:55 CET 2019


  Branch: refs/heads/feature/groovy-sandbox
  Home:   https://github.com/Evolveum/midpoint
  Commit: c270c435c7ed801714304744c96d5e8e5b587f6d
      https://github.com/Evolveum/midpoint/commit/c270c435c7ed801714304744c96d5e8e5b587f6d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-03-15 (Fri, 15 Mar 2019)

  Changed paths:
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-asynchronous-3.xsd
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/MockAsyncUpdateSource.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/AsyncUpdateListeningRegistry.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/MockAsyncUpdateSource.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ListeningActivity.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/Amqp091AsyncUpdateSource.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/AsyncUpdateConnectorInstance.java

  Log Message:
  -----------
  Add state reporting to async listening activities

Also fixed @NotNull annotation on item.add(...).


  Commit: 5bef7dd2f3adf15228a2fa739c19e3f99a28565a
      https://github.com/Evolveum/midpoint/commit/5bef7dd2f3adf15228a2fa739c19e3f99a28565a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-03-16 (Sat, 16 Mar 2019)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-asynchronous-3.xsd
    M model/model-impl/pom.xml
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/i2/MessageProcessingTaskHandler.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/AsyncUpdateTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SyncTaskHelper.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/pom.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContext.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
    M provisioning/ucf-impl-builtin/pom.xml
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ConnectorFactoryBuiltinImpl.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/Amqp091AsyncUpdateSource.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/AsyncUpdateConnectorConfiguration.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/AsyncUpdateConnectorInstance.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/TransformationalAsyncUpdateMessageListener.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityContextManager.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityContextManagerAware.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityContextManagerImpl.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/StalledTasksWatcher.java
    A samples/resources/grouper/resource-grouper-amqp091.xml
    A samples/resources/grouper/task-async-update.xml

  Log Message:
  -----------
  Add AsyncUpdateTaskHandler

Also refactored LiveSyncTaskHandler (see SyncTaskHelper).
Better state and error handling in Amqp091AsyncUpdateSource.
Fixed race condition during builtin connector discovery.
Added dependency of ucf-impl-builtin on security-api.
Other minor fixes.


  Commit: 1f2c7a8f31515be113b6a9ef7b33b59a353ac969
      https://github.com/Evolveum/midpoint/commit/1f2c7a8f31515be113b6a9ef7b33b59a353ac969
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-03-16 (Sat, 16 Mar 2019)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/messaging/MessageProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/messaging/MessageWrapper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/AsyncUpdateTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SyncTaskHelper.java
    M model/model-intest/src/test/resources/async/grouper-amqp091/resource-grouper-amqp091.xml
    M model/model-intest/testng-integration.xml
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/testng-integration.xml
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/AsyncUpdateConnectorInstance.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/TransformationalAsyncUpdateMessageListener.java

  Log Message:
  -----------
  Fix provisioning async update tests

And other minor changes.


  Commit: 18cd4595f0f56afd637b40ee16c23a7ed1ad4d2b
      https://github.com/Evolveum/midpoint/commit/18cd4595f0f56afd637b40ee16c23a7ed1ad4d2b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-03-18 (Mon, 18 Mar 2019)

  Changed paths:
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/AbstractDummyConnector.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAttributeDefinition.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaching.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdConvertor.java

  Log Message:
  -----------
  Stop caching of incomplete attributes


  Commit: 69f21660257431fbeea69c44929d267c144b96a1
      https://github.com/Evolveum/midpoint/commit/69f21660257431fbeea69c44929d267c144b96a1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-03-18 (Mon, 18 Mar 2019)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java

  Log Message:
  -----------
  Re-fetch incomplete object on synchronization

When synchronization service (import, recon, livesync, ...) gets
an object with incomplete attributes it will not mark it
as fully-loaded shadow; so it will be re-fetched during processing.


  Commit: 51c7e16b1352b0e201dbac7afbf33b481c5b97b5
      https://github.com/Evolveum/midpoint/commit/51c7e16b1352b0e201dbac7afbf33b481c5b97b5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-03-18 (Mon, 18 Mar 2019)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/AsyncUpdateConnectorInstance.java
    A samples/resources/grouper/function-library-grouper.xml
    M samples/resources/grouper/resource-grouper-amqp091.xml
    A samples/resources/grouper/resource-grouper-rest.xml
    A samples/resources/grouper/resource-grouper.xml
    M samples/resources/grouper/task-async-update.xml
    A samples/resources/grouper/task-reconciliation-groups.xml
    A samples/resources/grouper/task-reconciliation-users.xml

  Log Message:
  -----------
  Add combined Grouper resource sample

The resource combines traditional REST synchronous resource with
a new asynchronous AMQP connector configuration.

(plus some minor fixes)


  Commit: f861857b1a248194a43d05f35f05920903f833d6
      https://github.com/Evolveum/midpoint/commit/f861857b1a248194a43d05f35f05920903f833d6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-03-18 (Mon, 18 Mar 2019)

  Changed paths:
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/TransformationalAsyncUpdateMessageListener.java

  Log Message:
  -----------
  Add minor consistency check


  Commit: fa2f1ebac79a340cd44d7510f5bbeb4aa3635aaf
      https://github.com/Evolveum/midpoint/commit/fa2f1ebac79a340cd44d7510f5bbeb4aa3635aaf
  Author: kate <honchar at evolveum.com>
  Date:   2019-03-21 (Thu, 21 Mar 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  small fix + translation


  Commit: 49264700e355a75c286833605ebad9566c5445f7
      https://github.com/Evolveum/midpoint/commit/49264700e355a75c286833605ebad9566c5445f7
  Author: kate <honchar at evolveum.com>
  Date:   2019-03-21 (Thu, 21 Mar 2019)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_it.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ja.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_lt.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/schema/src/main/resources/localization/schema_fr.properties

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


  Commit: f646b4ad3ab6d7d3cdb79855d706a14a30b71fb3
      https://github.com/Evolveum/midpoint/commit/f646b4ad3ab6d7d3cdb79855d706a14a30b71fb3
  Author: skublik <lskublik at evolveum.com>
  Date:   2019-03-21 (Thu, 21 Mar 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/DisplayNamePanel.java

  Log Message:
  -----------
  removing NPE (MID-5190)


  Commit: 3e5df916422ded44f950f0c7603e57e4ca0276fc
      https://github.com/Evolveum/midpoint/commit/3e5df916422ded44f950f0c7603e57e4ca0276fc
  Author: skublik <lskublik at evolveum.com>
  Date:   2019-03-21 (Thu, 21 Mar 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_it.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ja.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_lt.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
    A infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringLangType.java
    M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringType.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanUnmarshaller.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismMarshaller.java
    M infra/prism-impl/src/main/resources/xml/ns/public/types-3.xsd
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingXml.java
    M infra/prism-impl/src/test/resources/common/json/user-jack-adhoc.json
    M infra/prism-impl/src/test/resources/common/json/user-jack-modified.json
    M infra/prism-impl/src/test/resources/common/json/user-jack-no-ns.json
    M infra/prism-impl/src/test/resources/common/json/user-jack.json
    M infra/prism-impl/src/test/resources/common/xml/user-jack-adhoc.xml
    M infra/prism-impl/src/test/resources/common/xml/user-jack-modified.xml
    M infra/prism-impl/src/test/resources/common/xml/user-jack-no-ns.xml
    M infra/prism-impl/src/test/resources/common/xml/user-jack.xml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack-adhoc.yaml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack-modified.yaml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack-no-ns.yaml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack.yaml
    M infra/schema/src/main/resources/localization/schema_fr.properties

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


  Commit: d9db0a77a32ec0b5dd50024d207ab7e24e41f8bd
      https://github.com/Evolveum/midpoint/commit/d9db0a77a32ec0b5dd50024d207ab7e24e41f8bd
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-03-21 (Thu, 21 Mar 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.java

  Log Message:
  -----------
  Remove double semicolon in import statement


  Commit: be983b10e7ef43e3e82ae704337e7c7c82292148
      https://github.com/Evolveum/midpoint/commit/be983b10e7ef43e3e82ae704337e7c7c82292148
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-03-21 (Thu, 21 Mar 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/DisplayNamePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PolyStringEditorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PolyStringEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsCountersPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsCountersPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_it.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ja.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_lt.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
    A infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringLangType.java
    M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringType.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanUnmarshaller.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismMarshaller.java
    M infra/prism-impl/src/main/resources/xml/ns/public/types-3.xsd
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingXml.java
    M infra/prism-impl/src/test/resources/common/json/user-jack-adhoc.json
    M infra/prism-impl/src/test/resources/common/json/user-jack-modified.json
    M infra/prism-impl/src/test/resources/common/json/user-jack-no-ns.json
    M infra/prism-impl/src/test/resources/common/json/user-jack.json
    M infra/prism-impl/src/test/resources/common/xml/user-jack-adhoc.xml
    M infra/prism-impl/src/test/resources/common/xml/user-jack-modified.xml
    M infra/prism-impl/src/test/resources/common/xml/user-jack-no-ns.xml
    M infra/prism-impl/src/test/resources/common/xml/user-jack.xml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack-adhoc.yaml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack-modified.yaml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack-no-ns.yaml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack.yaml
    M infra/schema/src/main/resources/localization/schema_fr.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleSuspendTaskExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportService.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/JRMidpointCompiler.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/JRMidpointEvaluator.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/SpringApplicationContext.java
    M model/report-impl/src/main/resources/jasperreports.properties
    A repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/CounterManager.java
    A repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/CounterSepcification.java
    A repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/CacheCounterManager.java
    R repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/CounterManager.java
    R repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/CounterSepcification.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/LightweightPartitioningTaskHandler.java
    A testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/OrgMembersTests.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/OrganizationStructureTests.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/UserAccountTests.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholds.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncFull.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncSimulate.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsReconFull.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsReconSimulate.java
    A testing/story/src/test/resources/thresholds/users-next.ldif
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/AssignmentHolderBasicTab.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/AssignmentsTab.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/assignmentholder/AssignmentHolderObjectListPage.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/assignmentholder/AssignmentHolderObjectListTable.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserAssignmentsTab.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserBasicTab.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersPageTable.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/AssignmentHolderDetailsPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/org/NewOrgPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/org/OrgTreePage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/user/ListUsersPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/user/UserPage.java

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


  Commit: ce11c0102078b4ce3848fe566b5598c2bc3297ab
      https://github.com/Evolveum/midpoint/commit/ce11c0102078b4ce3848fe566b5598c2bc3297ab
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-03-21 (Thu, 21 Mar 2019)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/AbstractDummyConnector.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAttributeDefinition.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-asynchronous-3.xsd
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/i2/MessageProcessingTaskHandler.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/messaging/MessageProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/messaging/MessageWrapper.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/AsyncUpdateTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SyncTaskHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/MockAsyncUpdateSource.java
    M model/model-intest/src/test/resources/async/grouper-amqp091/resource-grouper-amqp091.xml
    M model/model-intest/testng-integration.xml
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/pom.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/AsyncUpdateListeningRegistry.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContext.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/MockAsyncUpdateSource.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaching.java
    M provisioning/provisioning-impl/testng-integration.xml
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ListeningActivity.java
    M provisioning/ucf-impl-builtin/pom.xml
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ConnectorFactoryBuiltinImpl.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/Amqp091AsyncUpdateSource.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/AsyncUpdateConnectorConfiguration.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/AsyncUpdateConnectorInstance.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/TransformationalAsyncUpdateMessageListener.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdConvertor.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityContextManager.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityContextManagerAware.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityContextManagerImpl.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/StalledTasksWatcher.java
    A samples/resources/grouper/function-library-grouper.xml
    A samples/resources/grouper/resource-grouper-amqp091.xml
    A samples/resources/grouper/resource-grouper-rest.xml
    A samples/resources/grouper/resource-grouper.xml
    A samples/resources/grouper/task-async-update.xml
    A samples/resources/grouper/task-reconciliation-groups.xml
    A samples/resources/grouper/task-reconciliation-users.xml

  Log Message:
  -----------
  Merge branch 'feature/messaging-as-source'

# Conflicts:
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java


  Commit: 3e9b9cb73df4c88544007c35d7e9a62125ac678c
      https://github.com/Evolveum/midpoint/commit/3e9b9cb73df4c88544007c35d7e9a62125ac678c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-03-21 (Thu, 21 Mar 2019)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java

  Log Message:
  -----------
  Fix compilation error (after merge)


  Commit: bc2cdc4477a1dd7785580c47bb72e8007de2355e
      https://github.com/Evolveum/midpoint/commit/bc2cdc4477a1dd7785580c47bb72e8007de2355e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-03-21 (Thu, 21 Mar 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.java

  Log Message:
  -----------
  Fix preview changes (MID-5140, MID-5205)

As the deltas are now immutable we simply clone them before using
them to compute changes for preview. (We should have done so anyway.)


  Commit: eed740841013b33d2d1f1a8c61d1fe0b4f8eacd6
      https://github.com/Evolveum/midpoint/commit/eed740841013b33d2d1f1a8c61d1fe0b4f8eacd6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-03-21 (Thu, 21 Mar 2019)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java

  Log Message:
  -----------
  Accept modifyObject with no modifications

It is necessary e.g. for object recomputation.


  Commit: f759d58281d5964b0708efcc4dd2cc50d782cf4d
      https://github.com/Evolveum/midpoint/commit/f759d58281d5964b0708efcc4dd2cc50d782cf4d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2019-03-21 (Thu, 21 Mar 2019)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/DisplayNamePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/AbstractDummyConnector.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAttributeDefinition.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-asynchronous-3.xsd
    M model/model-impl/pom.xml
    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
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/i2/MessageProcessingTaskHandler.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/messaging/MessageProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/messaging/MessageWrapper.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/AsyncUpdateTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SyncTaskHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/MockAsyncUpdateSource.java
    M model/model-intest/src/test/resources/async/grouper-amqp091/resource-grouper-amqp091.xml
    M model/model-intest/testng-integration.xml
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/pom.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/AsyncUpdateListeningRegistry.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContext.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/MockAsyncUpdateSource.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaching.java
    M provisioning/provisioning-impl/testng-integration.xml
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ListeningActivity.java
    M provisioning/ucf-impl-builtin/pom.xml
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ConnectorFactoryBuiltinImpl.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/Amqp091AsyncUpdateSource.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/AsyncUpdateConnectorConfiguration.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/AsyncUpdateConnectorInstance.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/TransformationalAsyncUpdateMessageListener.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdConvertor.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityContextManager.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityContextManagerAware.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityContextManagerImpl.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/StalledTasksWatcher.java
    A samples/resources/grouper/function-library-grouper.xml
    A samples/resources/grouper/resource-grouper-amqp091.xml
    A samples/resources/grouper/resource-grouper-rest.xml
    A samples/resources/grouper/resource-grouper.xml
    A samples/resources/grouper/task-async-update.xml
    A samples/resources/grouper/task-reconciliation-groups.xml
    A samples/resources/grouper/task-reconciliation-users.xml

  Log Message:
  -----------
  Merge branch 'master' into feature/groovy-sandbox


Compare: https://github.com/Evolveum/midpoint/compare/a1d674a9a253...f759d58281d5


More information about the midPoint-svn mailing list