[midPoint-git] [Evolveum/midpoint] cf4bad: Adapt wf test to changes in operation result tree
mederly
noreply at github.com
Mon Jun 17 16:15:09 CEST 2019
Branch: refs/heads/feature/gui-wrapper
Home: https://github.com/Evolveum/midpoint
Commit: cf4badd02fff2789dd55320674d329e4619f66bf
https://github.com/Evolveum/midpoint/commit/cf4badd02fff2789dd55320674d329e4619f66bf
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-06-17 (Mon, 17 Jun 2019)
Changed paths:
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
Log Message:
-----------
Adapt wf test to changes in operation result tree
Commit: 69ae8aac8983306eca713e5de160d1eaa5ba7aad
https://github.com/Evolveum/midpoint/commit/69ae8aac8983306eca713e5de160d1eaa5ba7aad
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-06-17 (Mon, 17 Jun 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskInternalPerformanceTabPanel.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/TaskWorkBucketManagementPerformanceInformationUtil.java
Log Message:
-----------
Display work bucket management performance info
Commit: facdf603416125782af837a06dc425bc257366de
https://github.com/Evolveum/midpoint/commit/facdf603416125782af837a06dc425bc257366de
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-06-17 (Mon, 17 Jun 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskInternalPerformanceTabPanel.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ActionsExecutedInformation.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/EnvironmentalPerformanceInformation.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/IterativeTaskInformation.java
Log Message:
-----------
Display other performance info for the task
(this is perhaps temporary solution)
Commit: f56db9887a34ec2d47fd9adc69cb7a17918443ad
https://github.com/Evolveum/midpoint/commit/f56db9887a34ec2d47fd9adc69cb7a17918443ad
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-06-17 (Mon, 17 Jun 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskInternalPerformanceTabPanel.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ActionsExecutedInformation.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/TaskWorkBucketManagementPerformanceInformationUtil.java
Log Message:
-----------
Merge branch 'master' into feature/gui-wrapper
# Conflicts:
# gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskInternalPerformanceTabPanel.java
# infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ActionsExecutedInformation.java
Commit: 028ac9e58d4388684a0ea7db6b6417028f97e69d
https://github.com/Evolveum/midpoint/commit/028ac9e58d4388684a0ea7db6b6417028f97e69d
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-06-17 (Mon, 17 Jun 2019)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/EnvironmentalPerformanceInformation.java
M infra/util/src/main/resources/ctx-interceptor.xml
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AuditHelper.java
Log Message:
-----------
Add audit name resolution performance information
- AuditHelper.resolveName operation is now profiled via OperationResult
(this covers model-level name resolution)
- AuditService is now profiled via interceptor (this covers audit-level
name resolution)
Commit: 669ff30a8f8c0fc96539eb9ce2d1a403683f38c5
https://github.com/Evolveum/midpoint/commit/669ff30a8f8c0fc96539eb9ce2d1a403683f38c5
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-06-17 (Mon, 17 Jun 2019)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/cache/CacheConfigurationManager.java
Log Message:
-----------
Enhance cache configuration setup logging
(adding profile information)
Commit: 74b17b0714ad3171123697a2deb61bdb821be36f
https://github.com/Evolveum/midpoint/commit/74b17b0714ad3171123697a2deb61bdb821be36f
Author: skublik <lskublik at evolveum.com>
Date: 2019-06-17 (Mon, 17 Jun 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
Log Message:
-----------
fix for query field on audit log page
Commit: 9c2dfa7f8bf619aebb1f8c7e36e17cf65cd1a849
https://github.com/Evolveum/midpoint/commit/9c2dfa7f8bf619aebb1f8c7e36e17cf65cd1a849
Author: skublik <lskublik at evolveum.com>
Date: 2019-06-17 (Mon, 17 Jun 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/LoggingConfigurationTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/ProfilingConfigurationTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsPerformancePanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsPerformancePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskInternalPerformanceTabPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskInternalPerformanceTabPanel.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/TaskTabsVisibility.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
M infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java
A infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/ProfilingMode.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismSerializer.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContextImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismObjectImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismMarshaller.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismSerializerImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/PrismSchemaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/xnode/MapXNodeImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/xnode/XNodeImpl.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/cache/CacheConfigurationManager.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/MidPointConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerImpl.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ActionsExecutedInformation.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/CachePerformanceInformationUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/EnvironmentalPerformanceInformation.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/IterativeTaskInformation.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/MethodsPerformanceInformationUtil.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/RepositoryPerformanceInformationUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsUtil.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/TaskWorkBucketManagementPerformanceInformationUtil.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CachePerformanceInformationUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestEmptyItems.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseGenericObject.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseResource.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/performance/AbstractSchemaPerformanceTest.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/performance/TestBasicPerformance.java
M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
A infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodInvocationRecord.java
A infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodPerformanceInformation.java
M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodUsageStatistics.java
A infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodsPerformanceInformation.java
A infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodsPerformanceInformationImpl.java
A infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodsPerformanceMonitor.java
A infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodsPerformanceMonitorImpl.java
M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MidpointInterceptor.java
M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/ProfilingDataLog.java
M infra/util/src/main/java/com/evolveum/midpoint/util/caching/CacheUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/logging/MDCLevelTurboFilter.java
M infra/util/src/main/resources/ctx-interceptor.xml
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ClockworkMedic.java
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/ReconciliationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentHolderProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentTripleEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/FilterContentEvaluator.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/sync/SynchronizationServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AuditHelper.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.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/TestModelServiceContractCaching.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportJasperCreateTaskHandler.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCaretaker.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/ProvisioningTestUtil.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaching.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorFactory.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/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummy.java
R repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/perf/PerformanceInformationUtil.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeResultHandler.java
M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java
M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryServiceImpl.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/perf/SqlPerformanceMonitorImpl.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractHigherUnitTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java
M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/RunningTask.java
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/StaticTaskPartitionsDefinition.java
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskPartitionsDefinition.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/RunningTaskQuartzImpl.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/handlers/PartitioningTaskHandler.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/statistics/Statistics.java
M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
M testing/story/pom.xml
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConsistencyMechanism.java
A testing/story/src/test/java/com/evolveum/midpoint/testing/story/perf/Generate.java
A testing/story/src/test/java/com/evolveum/midpoint/testing/story/perf/TestImport.java
M testing/story/src/test/resources/ldap/recon-perf/resource-opendj.xml
A testing/story/src/test/resources/perf/import/org-basic.xml
A testing/story/src/test/resources/perf/import/resource-source.xml
A testing/story/src/test/resources/perf/import/source.sql
A testing/story/src/test/resources/perf/import/system-configuration.xml
A testing/story/src/test/resources/perf/import/task-import.xml
A testing/story/src/test/resources/perf/import/template-import.xml
A testing/story/src/test/resources/schema/perf-import.xsd
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master'
Commit: c993eaa5cbaa0f319823898185a09b0d896fec8c
https://github.com/Evolveum/midpoint/commit/c993eaa5cbaa0f319823898185a09b0d896fec8c
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-06-17 (Mon, 17 Jun 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskInternalPerformanceTabPanel.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerImpl.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/cache/CacheConfigurationManager.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/MethodsPerformanceInformationUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeResultHandler.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/RunningTask.java
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/RunningTaskQuartzImpl.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/TaskQuartzImpl.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/ExecutionManager.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/HandlerExecutor.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/statistics/Statistics.java
Log Message:
-----------
Fix various issues related to task statistics
Basically, synchronized master with gui-wrappers branch
in this respect.
Also fixed caching profile setup.
Commit: 280e2a8147f03058af43e93a058e1bcc85b605d1
https://github.com/Evolveum/midpoint/commit/280e2a8147f03058af43e93a058e1bcc85b605d1
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-06-17 (Mon, 17 Jun 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: bef62ba57299384cf5c21f01acfd814eee11ef32
https://github.com/Evolveum/midpoint/commit/bef62ba57299384cf5c21f01acfd814eee11ef32
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-06-17 (Mon, 17 Jun 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskInternalPerformanceTabPanel.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/cache/CacheConfigurationManager.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/EnvironmentalPerformanceInformation.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/util/src/main/resources/ctx-interceptor.xml
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AuditHelper.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeResultHandler.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/RunningTaskQuartzImpl.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/execution/ExecutionManager.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/HandlerExecutor.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/statistics/Statistics.java
Log Message:
-----------
Merge branch 'master' into feature/gui-wrapper
# Conflicts:
# repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
# repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/RunningTaskQuartzImpl.java
# repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/statistics/Statistics.java
Commit: 980cb3a1ca265e9f6141807e63c0a03186f7ef55
https://github.com/Evolveum/midpoint/commit/980cb3a1ca265e9f6141807e63c0a03186f7ef55
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-06-17 (Mon, 17 Jun 2019)
Changed paths:
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/gui/api/util/WebComponentUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java
Log Message:
-----------
Merge remote-tracking branch 'origin/feature/gui-wrapper' into feature/gui-wrapper
Compare: https://github.com/Evolveum/midpoint/compare/4f80e69220f9...980cb3a1ca26
More information about the midPoint-svn
mailing list