[midPoint-git] [Evolveum/midpoint] 4e6693: fix for different import channel uri (MID-5647)

[Lukas Skublik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 4e6693da6bc5c9aebb18a52240a57c58e3fe37c3
      https://github.com/Evolveum/midpoint/commit/4e6693da6bc5c9aebb18a52240a57c58e3fe37c3
  Author: skublik <lskublik at evolveum.com>
  Date:   2019-08-15 (Thu, 15 Aug 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java

  Log Message:
  -----------
  fix for different import channel uri (MID-5647)


  Commit: 250157f5c4922fd99bbc2737d22b7d3805fcd50b
      https://github.com/Evolveum/midpoint/commit/250157f5c4922fd99bbc2737d22b7d3805fcd50b
  Author: skublik <lskublik at evolveum.com>
  Date:   2019-08-15 (Thu, 15 Aug 2019)

  Changed paths:
    R .tx/config
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.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/data/column/ColumnUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SelectableBean.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectList.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsLoggedInUsersPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsLoggedInUsersPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.html
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ApprovalContextUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/MidPointUserProfilePrincipal.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/UserProfileService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/ReindexResultHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTaskInterruption.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTaskMechanics.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTaskMechanicsMultithreaded.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-interrupted-sync-imprecise.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-interrupted-sync.xml
    M model/model-intest/testng-integration.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.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/ResourceEventListenerImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/AffinityController.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/AsyncUpdater.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/ChangeProcessingCoordinator.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/ChangeProcessor.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/LiveSynchronizer.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/OldestTokenWatcher.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/ProcessChangeRequest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/SynchronizationOperationResult.java
    R provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/Synchronizer.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/Change.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ChangeHandler.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 provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdUtil.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/CollectingChangeHandler.java
    M provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeResultHandler.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/MidPointPrincipalManager.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/RunningTask.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin' into HEAD


Compare: https://github.com/Evolveum/midpoint/compare/30e2ced008f5...250157f5c492