Carry out remaining minor fixes

Final fixes in activities' schema were done here.
Also, pieces of deprecated code were removed.

This resolves MID-7185.

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskControlFlowSpecificationPanel.java

@@ -8,7 +8,6 @@
 
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.impl.page.admin.AbstractObjectMainPanel;
-import com.evolveum.midpoint.gui.impl.page.admin.ObjectDetailsModels;
 import com.evolveum.midpoint.gui.impl.page.admin.task.TaskDetailsModel;
 import com.evolveum.midpoint.gui.impl.prism.panel.SingleContainerPanel;
 import com.evolveum.midpoint.prism.path.ItemPath;
@@ -20,7 +19,7 @@
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
-@PanelType(name = "controlFlow", defaultContainerPath = "activity/controlFlow", defaultType = ActivityControlFlowSpecificationType.class)
+@PanelType(name = "controlFlow", defaultContainerPath = "activity/controlFlow", defaultType = ActivityControlFlowDefinitionType.class)
 @PanelInstance(identifier = "controlFlow", applicableForType = TaskType.class, childOf = TaskActivityPanel.class,
         display = @PanelDisplay(label = "ActivityDefinitionType.controlFlow", icon = GuiStyleConstants.CLASS_TASK_CONTROL_FLOW_ICON, order = 20))
 public class TaskControlFlowSpecificationPanel extends AbstractObjectMainPanel<TaskType, TaskDetailsModel> {
@@ -40,7 +39,7 @@ public TaskControlFlowSpecificationPanel(String id, TaskDetailsModel model, Cont
     protected void initLayout() {
         SingleContainerPanel activityDefinitionPanel = new SingleContainerPanel(ID_MAIN_PANEL,
                 PrismContainerWrapperModel.fromContainerWrapper(getObjectWrapperModel(), ItemPath.create(TaskType.F_ACTIVITY, ActivityDefinitionType.F_CONTROL_FLOW)),
-                ActivityControlFlowSpecificationType.COMPLEX_TYPE);
+                ActivityControlFlowDefinitionType.COMPLEX_TYPE);
         add(activityDefinitionPanel);
 
     }

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskDistributionPanel.java

@@ -15,11 +15,11 @@
 import com.evolveum.midpoint.web.application.PanelDisplay;
 import com.evolveum.midpoint.web.application.PanelInstance;
 import com.evolveum.midpoint.web.application.PanelType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivityDistributionDefinitionType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.WorkDistributionType;
 
-@PanelType(name = "distribution", defaultContainerPath = "activity/distribution", defaultType = WorkDistributionType.class)
+@PanelType(name = "distribution", defaultContainerPath = "activity/distribution", defaultType = ActivityDistributionDefinitionType.class)
 @PanelInstance(identifier = "distribution", applicableForType = TaskType.class, childOf = TaskActivityPanel.class,
         display = @PanelDisplay(label = "ActivityDefinitionType.distribution", icon = GuiStyleConstants.CLASS_TASK_DISTRIBUTION_ICON, order = 30))
 public class TaskDistributionPanel extends AbstractObjectMainPanel<TaskType, TaskDetailsModel> {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/GuiDisplayNameUtil.java

@@ -227,7 +227,7 @@ public static String getDisplayName(TaskErrorHandlingStrategyEntryType taskError
     //TODO improve
     public static String getDisplayName(ActivityDefinitionType partitionDefinition) {
 //        Integer index = partitionDefinition.getIndex();
-//        WorkDistributionType workManagementType = partitionDefinition.getWorkManagement();
+//        ActivityDistributionDefinitionType workManagementType = partitionDefinition.getWorkManagement();
 //
 //        String string = "";
 //        if (index != null) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java

@@ -154,8 +154,8 @@ public boolean isVisible() {
 //            @Override
 //            public WebMarkupContainer createPanel(String panelId) {
 //                // TODO FIX THIS after task schema change
-//                return new SingleContainerPanel<WorkDistributionType>(panelId,
-//                        PrismContainerWrapperModel.fromContainerWrapper(getObjectModel(), TaskType.F_PARTS), WorkDistributionType.COMPLEX_TYPE) {
+//                return new SingleContainerPanel<ActivityDistributionDefinitionType>(panelId,
+//                        PrismContainerWrapperModel.fromContainerWrapper(getObjectModel(), TaskType.F_PARTS), ActivityDistributionDefinitionType.COMPLEX_TYPE) {
 //
 //                    @Override
 //                    protected ItemVisibility getVisibility(ItemWrapper itemWrapper) {

infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/work/ActivityDefinitionUtil.java

@@ -8,13 +8,13 @@
 package com.evolveum.midpoint.schema.util.task.work;
 
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivityDefinitionType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.WorkDistributionType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivityDistributionDefinitionType;
 
 import org.jetbrains.annotations.NotNull;
 
 public class ActivityDefinitionUtil {
 
-    public static @NotNull WorkDistributionType findOrCreateDistribution(ActivityDefinitionType activity) {
+    public static @NotNull ActivityDistributionDefinitionType findOrCreateDistribution(ActivityDefinitionType activity) {
         if (activity.getDistribution() != null) {
             return activity.getDistribution();
         } else {

infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd

@@ -2447,13 +2447,13 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:enumeration>
-            <xsd:enumeration value="iterativeTaskObjectProcessing">
+            <xsd:enumeration value="activityItemProcessing">
                 <xsd:annotation>
                     <xsd:documentation>
-                        Object processing for iterative task.
+                        Item processing within an activity.
                     </xsd:documentation>
                     <xsd:appinfo>
-                        <jaxb:typesafeEnumMember name="ITERATIVE_TASK_OBJECT_PROCESSING"/>
+                        <jaxb:typesafeEnumMember name="ACTIVITY_ITEM_PROCESSING"/>
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:enumeration>

infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd

@@ -1785,14 +1785,14 @@
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:element>
-            <xsd:element name="controlFlow" type="tns:ActivityControlFlowSpecificationType" minOccurs="0">
+            <xsd:element name="controlFlow" type="tns:ActivityControlFlowDefinitionType" minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
                         Items like prerequisites, preconditions, error handling strategy, and so on.
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:element>
-            <xsd:element name="distribution" type="tns:WorkDistributionType" minOccurs="0">
+            <xsd:element name="distribution" type="tns:ActivityDistributionDefinitionType" minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
                         Distribution of the work executed as part of this activity.
@@ -2130,20 +2130,21 @@
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:element>
-            <xsd:element name="controlFlow" type="tns:ActivityControlFlowSpecificationTailoringType" minOccurs="0">
+            <xsd:element name="controlFlow" type="tns:ActivityControlFlowDefinitionTailoringType" minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
                         Items like prerequisites, preconditions, error handling strategy, and so on.
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:element>
-            <xsd:element name="distribution" type="tns:WorkDistributionTailoringType" minOccurs="0">
+            <xsd:element name="distribution" type="tns:ActivityDistributionDefinitionTailoringType" minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
                         Distribution of the work executed as part of this activity.
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:element>
+            <!-- TODO maybe we should create reporting definition tailoring type -->
             <xsd:element name="reporting" type="tns:ActivityReportingDefinitionType" minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
@@ -2155,7 +2156,7 @@
         <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
-    <xsd:complexType name="ActivityControlFlowSpecificationTailoringType">
+    <xsd:complexType name="ActivityControlFlowDefinitionTailoringType">
         <xsd:annotation>
             <xsd:documentation>
                 TODO
@@ -2166,7 +2167,7 @@
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:complexContent>
-            <xsd:extension base="tns:ActivityControlFlowSpecificationType">
+            <xsd:extension base="tns:ActivityControlFlowDefinitionType">
                 <xsd:sequence>
                     <xsd:element name="tailoringMode" type="tns:TailoringModeType" minOccurs="0" default="overwrite">
                         <xsd:annotation>
@@ -2180,7 +2181,7 @@
         </xsd:complexContent>
     </xsd:complexType>
 
-    <xsd:complexType name="WorkDistributionTailoringType">
+    <xsd:complexType name="ActivityDistributionDefinitionTailoringType">
         <xsd:annotation>
             <xsd:documentation>
                 TODO
@@ -2191,7 +2192,7 @@
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:complexContent>
-            <xsd:extension base="tns:WorkDistributionType">
+            <xsd:extension base="tns:ActivityDistributionDefinitionType">
                 <xsd:sequence>
                     <xsd:element name="tailoringMode" type="tns:TailoringModeType" minOccurs="0" default="overwrite">
                         <xsd:annotation>
@@ -2275,7 +2276,7 @@
         <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
-    <xsd:complexType name="ActivityControlFlowSpecificationType">
+    <xsd:complexType name="ActivityControlFlowDefinitionType">
         <xsd:annotation>
             <xsd:documentation>
                 TODO
@@ -3515,7 +3516,7 @@
         <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
-    <xsd:complexType name="WorkDistributionType">
+    <xsd:complexType name="ActivityDistributionDefinitionType">
         <xsd:annotation>
             <xsd:documentation>
                 Describes how we are going to distribute the work that is to be done:
@@ -6151,7 +6152,7 @@
                     <xsd:documentation>
                         Conditions that must be fulfilled (any of them) for the result of this tracing be written to the file.
 
-                        BEWARE! This condition is checked only for traces with the root of iterativeTaskObjectProcessing,
+                        BEWARE! This condition is checked only for traces with the root of activityItemProcessing,
                         i.e. those that were started right on the level of the iterative activity.
                     </xsd:documentation>
                     <xsd:appinfo>

repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/ActivityControlFlowDefinition.java

@@ -22,17 +22,17 @@ public class ActivityControlFlowDefinition implements DebugDumpable, Cloneable {
     /**
      * This bean is detached copy dedicated for this definition. It is therefore freely modifiable.
      */
-    @NotNull private ActivityControlFlowSpecificationType bean;
+    @NotNull private ActivityControlFlowDefinitionType bean;
 
-    private ActivityControlFlowDefinition(@NotNull ActivityControlFlowSpecificationType bean) {
+    private ActivityControlFlowDefinition(@NotNull ActivityControlFlowDefinitionType bean) {
         this.bean = bean;
     }
 
     @NotNull
     public static ActivityControlFlowDefinition create(ActivityDefinitionType activityDefinitionBean) {
-        ActivityControlFlowSpecificationType bean = activityDefinitionBean != null &&
+        ActivityControlFlowDefinitionType bean = activityDefinitionBean != null &&
                 activityDefinitionBean.getControlFlow() != null ?
-                activityDefinitionBean.getControlFlow().clone() : new ActivityControlFlowSpecificationType(PrismContext.get());
+                activityDefinitionBean.getControlFlow().clone() : new ActivityControlFlowDefinitionType(PrismContext.get());
         return new ActivityControlFlowDefinition(bean);
     }
 

repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/ActivityDistributionDefinition.java

@@ -25,17 +25,17 @@ public class ActivityDistributionDefinition implements DebugDumpable, Cloneable
     /**
      * This bean is detached copy dedicated for this definition. It is therefore freely modifiable.
      */
-    @NotNull private WorkDistributionType bean;
+    @NotNull private ActivityDistributionDefinitionType bean;
 
-    private ActivityDistributionDefinition(@NotNull WorkDistributionType bean) {
+    private ActivityDistributionDefinition(@NotNull ActivityDistributionDefinitionType bean) {
         this.bean = bean;
     }
 
     @NotNull
     public static ActivityDistributionDefinition create(ActivityDefinitionType activityDefinitionBean,
             Supplier<Integer> workerThreadsSupplier) {
-        WorkDistributionType bean = activityDefinitionBean != null && activityDefinitionBean.getDistribution() != null ?
-                activityDefinitionBean.getDistribution().clone() : new WorkDistributionType(PrismContext.get());
+        ActivityDistributionDefinitionType bean = activityDefinitionBean != null && activityDefinitionBean.getDistribution() != null ?
+                activityDefinitionBean.getDistribution().clone() : new ActivityDistributionDefinitionType(PrismContext.get());
         if (bean.getWorkerThreads() == null) {
             bean.setWorkerThreads(workerThreadsSupplier.get());
         }

repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/TailoringUtil.java

@@ -14,7 +14,7 @@
 import com.evolveum.midpoint.prism.path.ItemName;
 import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivityControlFlowSpecificationTailoringType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivityControlFlowDefinitionTailoringType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.TailoringModeType;
 
 import com.google.common.base.MoreObjects;
@@ -25,7 +25,7 @@ class TailoringUtil {
     /**
      * We assume the same property name is used in all "tailoring" objects.
      */
-    private static final ItemName F_TAILORING_MODE = ActivityControlFlowSpecificationTailoringType.F_TAILORING_MODE;
+    private static final ItemName F_TAILORING_MODE = ActivityControlFlowDefinitionTailoringType.F_TAILORING_MODE;
 
     static <T extends Containerable> @NotNull T getTailoredBean(@NotNull T original, @NotNull T tailoring) {
         TailoringModeType mode = getTailoringMode(tailoring.asPrismContainerValue());

repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/processing/ItemProcessingGatekeeper.java

@@ -415,7 +415,7 @@ private void computeStatusIfNeeded(OperationResult result) {
     private OperationResult initializeOperationResultIncludingTracingOrReporting(OperationResult parentResult) throws SchemaException {
         OperationResultBuilder builder = parentResult.subresult(OP_HANDLE)
                 .addParam("object", iterationItemInformation.toString());
-        if (workerTask.getTracingRequestedFor().contains(TracingRootType.ITERATIVE_TASK_OBJECT_PROCESSING)) {
+        if (workerTask.getTracingRequestedFor().contains(TracingRootType.ACTIVITY_ITEM_PROCESSING)) {
             tracingRequested = true;
             builder.tracingProfile(getTracer().compileProfile(workerTask.getTracingProfile(), parentResult));
         } else if (activityRun.shouldReportInternalOperations() &&

repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/processing/ItemProcessingMonitor.java

@@ -124,7 +124,7 @@ private void startTracing(@NotNull ActivityTracingConfigurationType tracingConfi
         TracingProfileType profile = configuredProfile != null ?
                 configuredProfile : activityRun.getBeans().tracer.getDefaultProfile();
         Collection<TracingRootType> points = !configuredPoints.isEmpty() ?
-                configuredPoints : List.of(TracingRootType.ITERATIVE_TASK_OBJECT_PROCESSING);
+                configuredPoints : List.of(TracingRootType.ACTIVITY_ITEM_PROCESSING);
 
         points.forEach(workerTask::addTracingRequest);
         workerTask.setTracingProfile(profile);

repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

@@ -3028,7 +3028,7 @@ protected void clearLogFile() {
     protected void setGlobalTracingOverride(@NotNull TracingProfileType profile) {
         List<TracingRootType> roots = Arrays.asList(
                 TracingRootType.CLOCKWORK_RUN,
-                TracingRootType.ITERATIVE_TASK_OBJECT_PROCESSING,
+                TracingRootType.ACTIVITY_ITEM_PROCESSING,
                 TracingRootType.ASYNCHRONOUS_MESSAGE_PROCESSING,
                 TracingRootType.LIVE_SYNC_CHANGE_PROCESSING,
                 TracingRootType.WORKFLOW_OPERATION