sqale: Updated organization configurations to 4.4 compliant

orgType is planned for removal in 4.4 and is not supported in new repo
Evolveum · Aug 23, 2021 · 20830c8 · 20830c8
1 parent 2042d86
commit 20830c8
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 39 deletions.
diff --git a/model/model-intest/src/test/resources/common/org-monkey-island.xml b/model/model-intest/src/test/resources/common/org-monkey-island.xml
@@ -16,7 +16,7 @@
         <description>The office of the most respectful Governor.</description>
         <displayName>Governor Office</displayName>
         <identifier>0001</identifier>
-        <orgType>functional</orgType>
+        <subtype>functional</subtype>
         <costCenter>CC0</costCenter>
         <locality>The Governor's Mansion</locality>
     </org>
@@ -31,7 +31,7 @@
         <delegable>true</delegable>
         <displayName>Ministry of Defense</displayName>
         <identifier>0002</identifier>
-        <orgType>functional</orgType>
+        <subtype>functional</subtype>
         <locality>The towers, bastions and bars</locality>
     </org>
 
@@ -45,7 +45,7 @@
         <delegable>true</delegable>
         <displayName>Ministry of Offense</displayName>
         <identifier>0003</identifier>
-        <orgType>functional</orgType>
+        <subtype>functional</subtype>
         <costCenter>CC666</costCenter>
     </org>
 
@@ -59,7 +59,7 @@
         <delegable>true</delegable>
         <displayName>Ministry of Rum</displayName>
         <identifier>0004</identifier>
-        <orgType>functional</orgType>
+        <subtype>functional</subtype>
         <costCenter>CCRUM</costCenter>
     </org>
 
@@ -73,7 +73,7 @@
         <delegable>true</delegable>
         <displayName>Swashbuckler Section</displayName>
         <identifier>0005</identifier>
-        <orgType>functional</orgType>
+        <subtype>functional</subtype>
     </org>
 
     <!-- Scumm Bar also acts as a role, assigning account on dummy resource. -->
@@ -97,7 +97,7 @@
         <delegable>true</delegable>
         <displayName>Scumm Bar</displayName>
         <identifier>0006</identifier>
-        <orgType>functional</orgType>
+        <subtype>functional</subtype>
         <locality>Mêlée Island</locality>
     </org>
 
@@ -107,7 +107,7 @@
         <name>PRoot</name>
         <description>Project organizational structure root</description>
         <displayName>Projects</displayName>
-        <orgType>project</orgType>
+        <subtype>project</subtype>
     </org>
 
     <org oid="00000000-8888-6666-0000-200000000001">
@@ -119,7 +119,7 @@
         <delegable>true</delegable>
         <displayName>Save Elaine</displayName>
         <identifier>0001</identifier>
-        <orgType>project</orgType>
+        <subtype>project</subtype>
     </org>
 
     <org oid="00000000-8888-6666-0000-200000000002">
@@ -131,7 +131,7 @@
         <delegable>true</delegable>
         <displayName>Kidnap and marry Elaine</displayName>
         <identifier>0002</identifier>
-        <orgType>project</orgType>
+        <subtype>project</subtype>
     </org>
 
 </objects>
diff --git a/model/model-intest/src/test/resources/object-template-ranges/org-monkey-island-local.xml b/model/model-intest/src/test/resources/object-template-ranges/org-monkey-island-local.xml
@@ -21,7 +21,7 @@
         </extension>
         <displayName>Governor Office</displayName>
         <identifier>0001</identifier>
-        <orgType>functional</orgType>
+        <subtype>functional</subtype>
         <costCenter>CC0</costCenter>
         <locality>The Governor's Mansion</locality>
     </org>
@@ -35,7 +35,7 @@
         </assignment>
         <displayName>Ministry of Defense</displayName>
         <identifier>0002</identifier>
-        <orgType>functional</orgType>
+        <subtype>functional</subtype>
         <locality>The towers, bastions and bars</locality>
     </org>
 
@@ -48,7 +48,7 @@
         </assignment>
         <displayName>Ministry of Offense</displayName>
         <identifier>0003</identifier>
-        <orgType>functional</orgType>
+        <subtype>functional</subtype>
         <costCenter>CC666</costCenter>
     </org>
 
@@ -61,7 +61,7 @@
         </assignment>
         <displayName>Ministry of Rum</displayName>
         <identifier>0004</identifier>
-        <orgType>functional</orgType>
+        <subtype>functional</subtype>
         <costCenter>CCRUM</costCenter>
     </org>
 
@@ -74,7 +74,7 @@
         </assignment>
         <displayName>Swashbuckler Section</displayName>
         <identifier>0005</identifier>
-        <orgType>functional</orgType>
+        <subtype>functional</subtype>
     </org>
 
     <!-- Scumm Bar also acts as a role, assigning account on dummy resource. -->
@@ -97,7 +97,7 @@
         </assignment>
         <displayName>Scumm Bar</displayName>
         <identifier>0006</identifier>
-        <orgType>functional</orgType>
+        <subtype>functional</subtype>
         <locality>Mêlée Island</locality>
     </org>
 
@@ -107,7 +107,7 @@
         <name>PRoot</name>
         <description>Project organizational structure root</description>
         <displayName>Projects</displayName>
-        <orgType>project</orgType>
+        <subtype>project</subtype>
     </org>
 
     <org oid="00000000-8888-6666-0000-200000000001">
@@ -118,7 +118,7 @@
         </assignment>
         <displayName>Save Elaine</displayName>
         <identifier>0001</identifier>
-        <orgType>project</orgType>
+        <subtype>project</subtype>
     </org>
 
     <org oid="00000000-8888-6666-0000-200000000002">
@@ -129,7 +129,7 @@
         </assignment>
         <displayName>Kidnap and marry Elaine</displayName>
         <identifier>0002</identifier>
-        <orgType>project</orgType>
+        <subtype>project</subtype>
     </org>
 
 </c:objects>
diff --git a/model/model-intest/src/test/resources/orgstruct/object-template-org.xml b/model/model-intest/src/test/resources/orgstruct/object-template-org.xml
@@ -20,7 +20,7 @@
             <authoritative>true</authoritative>
             <strength>strong</strength>            <!-- there's already an assignment, so normal mappings are skipped on object add -->
             <source>
-                <path>orgType</path>
+                <path>subtype</path>
             </source>
             <expression>
                 <assignmentTargetSearch>
@@ -45,7 +45,7 @@
             </expression>
             <condition>
                 <script>
-                    <code>orgType == 'fictional'</code>
+                    <code>subtype == 'fictional'</code>
                 </script>
             </condition>
         </mapping>
@@ -56,7 +56,7 @@
         <authoritative>true</authoritative>
         <strength>strong</strength>            <!-- there's already an assignment, so normal mappings are skipped on object add -->
         <source>
-            <path>orgType</path>
+            <path>subtype</path>
         </source>
         <expression>
             <assignmentTargetSearch>
@@ -69,7 +69,7 @@
         </target>
         <condition>
             <script>
-                <code>orgType == 'functional'</code>
+                <code>subtype == 'functional'</code>
             </script>
         </condition>
     </mapping>

diff --git a/model/model-intest/src/test/resources/orgstruct/org-caribbean.xml b/model/model-intest/src/test/resources/orgstruct/org-caribbean.xml
@@ -16,7 +16,7 @@
         </assignment>
         <displayName>The Golden Age of Piracy</displayName>
         <identifier>C001</identifier>
-        <orgType>piracy</orgType>
+        <subtype>piracy</subtype>
     </org>
 
     <org oid="00000000-8888-6666-0000-c00000000002">
@@ -30,7 +30,7 @@
         </assignment>
         <displayName>The Crown</displayName>
         <identifier>C002</identifier>
-        <orgType>piracy</orgType>
+        <subtype>piracy</subtype>
     </org>
 
     <org oid="00000000-8888-6666-0000-c00000000003">
@@ -44,7 +44,7 @@
         </assignment>
         <displayName>Government of Jamaica</displayName>
         <identifier>C003</identifier>
-        <orgType>piracy</orgType>
+        <subtype>piracy</subtype>
         <inducement>
             <!-- Monkey Island Governor Office -->
             <targetRef oid="00000000-8888-6666-0000-100000000001" type="OrgType"/>
@@ -63,7 +63,7 @@
         <delegable>true</delegable>
         <displayName>Department of Things</displayName>
         <identifier>C004</identifier>
-        <orgType>piracy</orgType>
+        <subtype>piracy</subtype>
     </org>
 
     <org oid="00000000-8888-6666-0000-c00000000005">
@@ -78,7 +78,7 @@
         <delegable>true</delegable>
         <displayName>Department of People</displayName>
         <identifier>C005</identifier>
-        <orgType>piracy</orgType>
+        <subtype>piracy</subtype>
         <inducement>
             <!-- Monkey Island Scumm Bar -->
             <targetRef oid="00000000-8888-6666-0000-100000000006" type="OrgType"/>
@@ -98,7 +98,7 @@
         <delegable>true</delegable>
         <displayName>Entertainment Section</displayName>
         <identifier>C006</identifier>
-        <orgType>piracy</orgType>
+        <subtype>piracy</subtype>
     </org>
 
 </objects>
diff --git a/model/model-intest/src/test/resources/orgstruct/org-fictional.xml b/model/model-intest/src/test/resources/orgstruct/org-fictional.xml
@@ -11,6 +11,6 @@
     <description>Fictional org unit. It triggers mapping in object template.</description>
     <displayName>Fictional Org</displayName>
     <identifier>FfFfFf</identifier>
-    <orgType>fictional</orgType>
+    <subtype>fictional</subtype>
 </org>
 
diff --git a/model/model-intest/src/test/resources/orgstruct/org-temp.xml b/model/model-intest/src/test/resources/orgstruct/org-temp.xml
@@ -11,7 +11,7 @@
     <description>Suddenly appearing and disappearing org</description>
     <displayName>Temp Org</displayName>
     <identifier>oooo</identifier>
-    <orgType>functional</orgType>
+    <subtype>functional</subtype>
     <costCenter>CCoooo</costCenter>
 </org>
 
diff --git a/model/model-intest/src/test/resources/rbac/org-project-reclaim-black-pearl.xml b/model/model-intest/src/test/resources/rbac/org-project-reclaim-black-pearl.xml
@@ -16,5 +16,5 @@
     </assignment>
     <displayName>Reclaim Black Pearl</displayName>
     <identifier>5000</identifier>
-    <orgType>project</orgType>
+    <subtype>project</subtype>
 </org>
diff --git a/model/model-intest/src/test/resources/rbac/role-all-loot.xml b/model/model-intest/src/test/resources/rbac/role-all-loot.xml
@@ -13,7 +13,7 @@
         xmlns:piracy="http://midpoint.evolveum.com/xml/ns/samples/piracy">
     <name>All Loot</name>
     <inducement>
-        <targetRef>
+        <targetRef type="RoleType">
             <filter>
                 <q:equal>
                     <q:path>roleType</q:path>

diff --git a/model/model-intest/src/test/resources/rbac/role-all-treasure.xml b/model/model-intest/src/test/resources/rbac/role-all-treasure.xml
@@ -13,7 +13,7 @@
         xmlns:piracy="http://midpoint.evolveum.com/xml/ns/samples/piracy">
     <name>All Treasure</name>
     <inducement>
-        <targetRef>
+        <targetRef type="RoleType">
             <filter>
                 <q:equal>
                     <q:path>roleType</q:path>

diff --git a/model/model-intest/src/test/resources/rbac/role-all-you-can-get.xml b/model/model-intest/src/test/resources/rbac/role-all-you-can-get.xml
@@ -13,7 +13,7 @@
         xmlns:piracy="http://midpoint.evolveum.com/xml/ns/samples/piracy">
     <name>All You Can Get</name>
     <inducement>
-        <targetRef>
+        <targetRef type="RoleType">
             <filter>
                 <q:equal>
                     <q:path>roleType</q:path>
@@ -24,7 +24,7 @@
         </targetRef>
     </inducement>
     <inducement>
-        <targetRef>
+        <targetRef type="RoleType">
             <filter>
                 <q:equal>
                     <q:path>roleType</q:path>

diff --git a/model/model-intest/src/test/resources/rbac/role-project-omnimanager.xml b/model/model-intest/src/test/resources/rbac/role-project-omnimanager.xml
@@ -18,7 +18,7 @@
             <type>OrgType</type>
             <filter>
                 <q:equal>
-                    <q:path>orgType</q:path>
+                    <q:path>subtype</q:path>
                     <q:value>project</q:value>
                 </q:equal>
             </filter>

diff --git a/model/model-intest/src/test/resources/scripthooks/org-top.xml b/model/model-intest/src/test/resources/scripthooks/org-top.xml
@@ -14,5 +14,5 @@
     <description>Top-level org</description>
     <displayName>TOP</displayName>
     <identifier>0000</identifier>
-    <orgType>functional</orgType>
+    <subtype>functional</subtype>
 </org>
diff --git a/model/model-intest/src/test/resources/security/role-approver.xml b/model/model-intest/src/test/resources/security/role-approver.xml
@@ -108,7 +108,7 @@
         <item>identifier</item>
         <item>description</item>
         <item>riskLevel</item>
-        <item>orgType</item>
+        <item>subtype</item>
     </authorization>
     <authorization>
         <name>services-read</name>

diff --git a/model/model-intest/src/test/resources/security/role-filter-object-user-location-shadows.xml b/model/model-intest/src/test/resources/security/role-filter-object-user-location-shadows.xml
@@ -58,7 +58,7 @@
             <type>OrgType</type>
             <filter>
                 <q:equal>
-                    <q:path>orgType</q:path>
+                    <q:path>subtype</q:path>
                     <q:value>functional</q:value>
                 </q:equal>
             </filter>