From 9c341b1d655facb7f419fe078c5528cb465b0f01 Mon Sep 17 00:00:00 2001
From: root <root@ip-172-31-30-20.us-west-2.compute.internal>
Date: Mon, 13 Nov 2023 23:22:13 +0000
Subject: [PATCH] fix import tasks in midpoint

---
 .../tasks/300-task-hr-import.xml              | 96 ++++++++++++-------
 .../tasks/300-task-import-guests-sql.xml      | 95 +++++++++++-------
 .../tasks/300-task-import-sis-persons.xml     | 91 +++++++++++-------
 .../tasks/999-task-recomputation-users.xml    | 60 ++++++++----
 4 files changed, 217 insertions(+), 125 deletions(-)

diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-hr-import.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-hr-import.xml
index a05dace..8c906c7 100644
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-hr-import.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-hr-import.xml
@@ -1,37 +1,61 @@
-<task xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-      xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
-      xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-      xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
-      xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3"
-      xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
-      xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
-      oid="62b23d51-8b36-454a-af39-45e078a4563f">
-   <name>HR: Full Import</name>
-   <extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:type="c:ExtensionType">
-      <mext:kind>account</mext:kind>
-      <mext:objectclass>ri:AccountObjectClass</mext:objectclass>
-<!--
-      <mext:tracing>
-          <interval>500</interval>
-      </mext:tracing> -->
-   </extension>
-   <assignment>
-      <targetRef oid="00000000-0000-0000-0000-000000000503" type="ArchetypeType" /> <!--Import task-->
-   </assignment>
-   <taskIdentifier>bdd0fa20-4836-458a-8837-8983b6632ee5</taskIdentifier>
-   <ownerRef oid="00000000-0000-0000-0000-000000000002"
-             relation="org:default"
-             type="c:UserType"><!-- administrator --></ownerRef>
-   <executionStatus>runnable</executionStatus>
-   <category>ImportingAccounts</category>
-   <objectRef oid="10000000-9999-9999-0000-a000ff000001"
-              relation="org:default"
-              type="c:ResourceType"><!-- HR SOR Source --></objectRef>
-   <recurrence>recurring</recurrence>
-   <schedule>
-     <interval>300</interval>
-   </schedule>
-   <binding>loose</binding>
+<task xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oid="3cd224bf-8628-4054-8a0d-163d58aa4f91" version="0">
+    <name>HR: Full import</name>
+    <assignment id="1">
+        <targetRef oid="00000000-0000-0000-0000-000000000503" relation="org:default" type="c:ArchetypeType">
+            <!-- Import task -->
+        </targetRef>
+        <activation>
+            <effectiveStatus>enabled</effectiveStatus>
+        </activation>
+    </assignment>
+    <iteration>0</iteration>
+    <iterationToken/>
+    <archetypeRef oid="00000000-0000-0000-0000-000000000503" relation="org:default" type="c:ArchetypeType">
+        <!-- Import task -->
+    </archetypeRef>
+    <roleMembershipRef oid="00000000-0000-0000-0000-000000000503" relation="org:default" type="c:ArchetypeType">
+        <!-- Import task -->
+    </roleMembershipRef>
+    <taskIdentifier>1699914773015-55486-1</taskIdentifier>
+    <ownerRef oid="e897468f-20bd-419c-8fc5-1fe60e2600de" relation="org:default" type="c:UserType">
+        <!-- banderson -->
+    </ownerRef>
+    <executionState>runnable</executionState>
+    <objectRef oid="10000000-9999-9999-0000-a000ff000001" relation="org:default" type="c:ResourceType">
+        <!-- Source: HR System -->
+    </objectRef>
+    <binding>loose</binding>
+    <schedule>
+	<interval>300</interval>
+    </schedule>
+    <activity>
+        <work>
+            <import>
+                <resourceObjects>
+                    <resourceRef oid="10000000-9999-9999-0000-a000ff000001" relation="org:default" type="c:ResourceType">
+                        <!-- Source: HR System -->
+                    </resourceRef>
+                    <kind>account</kind>
+                    <intent>default</intent>
+                    <objectclass>ri:AccountObjectClass</objectclass>
+                </resourceObjects>
+            </import>
+        </work>
+    </activity>
+    <affectedObjects>
+        <activity id="2">
+            <activityType>c:import</activityType>
+            <resourceObjects>
+                <resourceRef oid="10000000-9999-9999-0000-a000ff000001" relation="org:default" type="c:ResourceType">
+                    <!-- Source: HR System -->
+                </resourceRef>
+                <kind>account</kind>
+                <intent>default</intent>
+                <objectclass>ri:AccountObjectClass</objectclass>
+            </resourceObjects>
+            <executionMode>full</executionMode>
+            <predefinedConfigurationToUse>production</predefinedConfigurationToUse>
+        </activity>
+    </affectedObjects>
 </task>
+
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-guests-sql.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-guests-sql.xml
index aa58b27..dc7de82 100644
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-guests-sql.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-guests-sql.xml
@@ -1,38 +1,61 @@
-<task xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-      xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
-      xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-      xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
-      xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3"
-      xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
-      xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
-      oid="9ddfc0ff-6293-4f34-8eb7-5a049c21480f">
-   <name>Guests: Full Import</name>
-   <extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:type="c:ExtensionType">
-      <mext:kind>account</mext:kind>
-      <mext:objectclass>ri:AccountObjectClass</mext:objectclass>
-<!--
-      <mext:tracing>
-          <interval>500</interval>
-      </mext:tracing> -->
-   </extension>
-   <assignment>
-      <targetRef oid="00000000-0000-0000-0000-000000000503" type="ArchetypeType" /> <!--Import task-->
-   </assignment>
-   <taskIdentifier>fe3c15a4-71be-4aac-8bc9-65a61b6e8d77</taskIdentifier>
-   <ownerRef oid="00000000-0000-0000-0000-000000000002"
-             relation="org:default"
-             type="c:UserType"><!-- administrator --></ownerRef>
-   <executionStatus>runnable</executionStatus>
-   <category>ImportingAccounts</category>
-   <objectRef oid="edb9e47b-e8ad-48b7-9127-ae7b8911a8f2"
-              relation="org:default"
-              type="c:ResourceType"><!-- Guests from COmanage DB --></objectRef>
-   <recurrence>recurring</recurrence>
-   <schedule>
-     <interval>1800</interval>
-   </schedule>
-   <binding>loose</binding>
+<task xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oid="ec605247-fcb3-42f7-a241-3b1aaa96cea4" version="1">
+    <name>Guests: Full import</name>
+    <assignment id="1">
+        <targetRef oid="00000000-0000-0000-0000-000000000503" relation="org:default" type="c:ArchetypeType">
+            <!-- Import task -->
+        </targetRef>
+        <activation>
+            <effectiveStatus>enabled</effectiveStatus>
+        </activation>
+    </assignment>
+    <iteration>0</iteration>
+    <iterationToken/>
+    <archetypeRef oid="00000000-0000-0000-0000-000000000503" relation="org:default" type="c:ArchetypeType">
+        <!-- Import task -->
+    </archetypeRef>
+    <roleMembershipRef oid="00000000-0000-0000-0000-000000000503" relation="org:default" type="c:ArchetypeType">
+        <!-- Import task -->
+    </roleMembershipRef>
+    <taskIdentifier>1699915060445-55486-1</taskIdentifier>
+    <ownerRef oid="e897468f-20bd-419c-8fc5-1fe60e2600de" relation="org:default" type="c:UserType">
+        <!-- banderson -->
+    </ownerRef>
+    <executionState>runnable</executionState>
+    <objectRef oid="edb9e47b-e8ad-48b7-9127-ae7b8911a8f2" relation="org:default" type="c:ResourceType">
+        <!-- Source: Guest DB -->
+    </objectRef>
+    <binding>loose</binding>
+    <schedule>
+        <interval>1800</interval>
+    </schedule>
+    <activity>
+        <work>
+            <import>
+                <resourceObjects>
+                    <resourceRef oid="edb9e47b-e8ad-48b7-9127-ae7b8911a8f2" relation="org:default" type="c:ResourceType">
+                        <!-- Source: Guest DB -->
+                    </resourceRef>
+                    <kind>account</kind>
+                    <intent>default</intent>
+                    <objectclass>ri:AccountObjectClass</objectclass>
+                </resourceObjects>
+            </import>
+        </work>
+    </activity>
+    <affectedObjects>
+        <activity id="2">
+            <activityType>c:import</activityType>
+            <resourceObjects>
+                <resourceRef oid="edb9e47b-e8ad-48b7-9127-ae7b8911a8f2" relation="org:default" type="c:ResourceType">
+                    <!-- Source: Guest DB -->
+                </resourceRef>
+                <kind>account</kind>
+                <intent>default</intent>
+                <objectclass>ri:AccountObjectClass</objectclass>
+            </resourceObjects>
+            <executionMode>full</executionMode>
+            <predefinedConfigurationToUse>production</predefinedConfigurationToUse>
+        </activity>
+    </affectedObjects>
 </task>
 
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-sis-persons.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-sis-persons.xml
index d32a38d..d406073 100644
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-sis-persons.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-sis-persons.xml
@@ -1,35 +1,58 @@
-<task xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-      xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
-      xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-      xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
-      xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3"
-      xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
-      xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
-      oid="22c2a3d0-0961-4255-9eec-c550a79aeaaa">
-   <name>SIS: Full Import</name>
-   <extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:type="c:ExtensionType">
-      <mext:kind>account</mext:kind>
-      <mext:objectclass>ri:AccountObjectClass</mext:objectclass>
-<!--
-      <mext:tracing>
-          <interval>500</interval>
-      </mext:tracing> -->
-   </extension>
-   <assignment>
-      <targetRef oid="00000000-0000-0000-0000-000000000503" type="ArchetypeType" /> <!--Import task-->
-   </assignment>
-   <taskIdentifier>1535407239440-0-1</taskIdentifier>
-   <ownerRef oid="00000000-0000-0000-0000-000000000002"
-             relation="org:default"
-             type="c:UserType"><!-- administrator --></ownerRef>
-   <executionStatus>runnable</executionStatus>
-   <dependent>1494860531232132-0-1</dependent>
-   <category>ImportingAccounts</category>
-   <objectRef oid="4d70a0da-02dd-41cf-b0a1-00e75d3eaa15"
-              relation="org:default"
-              type="c:ResourceType"><!-- SQL SIS persons (sources) --></objectRef>
-   <recurrence>single</recurrence>
-   <binding>loose</binding>
+<task xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oid="05345d93-3cd8-4c16-9364-064938766b8a" version="0">
+    <name>SIS: Full import</name>
+    <assignment id="1">
+        <targetRef oid="00000000-0000-0000-0000-000000000503" relation="org:default" type="c:ArchetypeType">
+            <!-- Import task -->
+        </targetRef>
+        <activation>
+            <effectiveStatus>enabled</effectiveStatus>
+        </activation>
+    </assignment>
+    <iteration>0</iteration>
+    <iterationToken/>
+    <archetypeRef oid="00000000-0000-0000-0000-000000000503" relation="org:default" type="c:ArchetypeType">
+        <!-- Import task -->
+    </archetypeRef>
+    <roleMembershipRef oid="00000000-0000-0000-0000-000000000503" relation="org:default" type="c:ArchetypeType">
+        <!-- Import task -->
+    </roleMembershipRef>
+    <taskIdentifier>1699915517757-55486-1</taskIdentifier>
+    <ownerRef oid="e897468f-20bd-419c-8fc5-1fe60e2600de" relation="org:default" type="c:UserType">
+        <!-- banderson -->
+    </ownerRef>
+    <executionState>runnable</executionState>
+    <objectRef oid="4d70a0da-02dd-41cf-b0a1-00e75d3eaa15" relation="org:default" type="c:ResourceType">
+        <!-- Source: SIS DB -->
+    </objectRef>
+    <binding>loose</binding>
+    <activity>
+        <work>
+            <import>
+                <resourceObjects>
+                    <resourceRef oid="4d70a0da-02dd-41cf-b0a1-00e75d3eaa15" relation="org:default" type="c:ResourceType">
+                        <!-- Source: SIS DB -->
+                    </resourceRef>
+                    <kind>account</kind>
+                    <intent>default</intent>
+                    <objectclass>ri:AccountObjectClass</objectclass>
+                </resourceObjects>
+            </import>
+        </work>
+    </activity>
+    <affectedObjects>
+        <activity id="2">
+            <activityType>c:import</activityType>
+            <resourceObjects>
+                <resourceRef oid="4d70a0da-02dd-41cf-b0a1-00e75d3eaa15" relation="org:default" type="c:ResourceType">
+                    <!-- Source: SIS DB -->
+                </resourceRef>
+                <kind>account</kind>
+                <intent>default</intent>
+                <objectclass>ri:AccountObjectClass</objectclass>
+            </resourceObjects>
+            <executionMode>full</executionMode>
+            <predefinedConfigurationToUse>production</predefinedConfigurationToUse>
+        </activity>
+    </affectedObjects>
 </task>
+
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/999-task-recomputation-users.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/999-task-recomputation-users.xml
index 1c26f95..a91f7b7 100644
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/999-task-recomputation-users.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/999-task-recomputation-users.xml
@@ -1,26 +1,48 @@
-<task xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-      xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-      xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3"
-      oid="83a737ea-5eb7-4e78-b431-331cccf02354">
-    <name>User recomputation</name>
-    <extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3">
-        <mext:objectType>c:UserType</mext:objectType>
-        <!-- <mext:tracingInterval>200</mext:tracingInterval> -->
-    </extension>
-    <assignment>
-        <targetRef oid="00000000-0000-0000-0000-000000000502" type="ArchetypeType"/> <!--Recomputation task -->
+<task xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oid="f71bd7ce-2329-42da-a71e-b7c45ebed549" version="0">
+    <name>Recomputation task</name>
+    <assignment id="1">
+        <targetRef oid="00000000-0000-0000-0000-000000000502" relation="org:default" type="c:ArchetypeType">
+            <!-- Recomputation task -->
+        </targetRef>
+        <activation>
+            <effectiveStatus>enabled</effectiveStatus>
+        </activation>
     </assignment>
-    <ownerRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
-        <!-- administrator -->
+    <iteration>0</iteration>
+    <iterationToken/>
+    <archetypeRef oid="00000000-0000-0000-0000-000000000502" relation="org:default" type="c:ArchetypeType">
+        <!-- Recomputation task -->
+    </archetypeRef>
+    <roleMembershipRef oid="00000000-0000-0000-0000-000000000502" relation="org:default" type="c:ArchetypeType">
+        <!-- Recomputation task -->
+    </roleMembershipRef>
+    <taskIdentifier>1699916318518-55486-1</taskIdentifier>
+    <ownerRef oid="e897468f-20bd-419c-8fc5-1fe60e2600de" relation="org:default" type="c:UserType">
+        <!-- banderson -->
     </ownerRef>
-    <channel>http://midpoint.evolveum.com/xml/ns/public/provisioning/channels-3#recompute</channel>
-    <taskIdentifier>1494860531232132-0-2</taskIdentifier>
-   <executionStatus>waiting</executionStatus>
-   <waitingReason>otherTasks</waitingReason>
-    <category>Recomputation</category>
-      <recurrence>recurring</recurrence>
+    <executionState>runnable</executionState>
     <binding>loose</binding>
     <schedule>
         <interval>300</interval>
     </schedule>
+    <activity>
+        <work>
+            <recomputation>
+                <objects>
+                    <type>c:UserType</type>
+                </objects>
+            </recomputation>
+        </work>
+    </activity>
+    <affectedObjects>
+        <activity id="2">
+            <activityType>c:recomputation</activityType>
+            <objects>
+                <type>c:UserType</type>
+            </objects>
+            <executionMode>full</executionMode>
+            <predefinedConfigurationToUse>production</predefinedConfigurationToUse>
+        </activity>
+    </affectedObjects>
 </task>
+