Skip to content

Commit

Permalink
MID-8842 ninja, xsd schemas cleanup, fixed removed elements/types. fi…
Browse files Browse the repository at this point in the history 
…xed plannedRemoval/removedSince annotations
  • Loading branch information
@1azyman
1azyman committed Jun 30, 2023
1 parent f093a86 commit 9bbf9e8
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 32 deletions.
2 changes: 1 addition & 1 deletion infra/schema/src/main/resources/xml/ns/public/common/common-case-management-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
<xsd:appinfo>
<a:objectReferenceTargetType>tns:TaskType</a:objectReferenceTargetType>
<a:removed>true</a:removed>
<a:deprecatedSince>5.0</a:deprecatedSince>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down
16 changes: 8 additions & 8 deletions infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8344,7 +8344,7 @@
<!-- Note: it was deprecated, but the midPoint still used it up to (excluding) 4.8 -->
<a:deprecatedSince>4.0</a:deprecatedSince>
<a:removed>true</a:removed>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -8861,7 +8861,7 @@
<a:since>3.6</a:since>
<a:removed>true</a:removed>
<a:deprecatedSince>4.4</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -9649,7 +9649,7 @@
<a:displayName>ObjectPolicyConfigurationType.propertyConstraint</a:displayName>
<a:removed>true</a:removed>
<a:deprecatedSince>4.1</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -14578,7 +14578,7 @@
<a:displayName>RoleManagementConfigurationType.roleCatalogRef</a:displayName>
<a:removed>true</a:removed>
<a:deprecatedSince>4.6</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -14597,7 +14597,7 @@
<a:displayName>RoleManagementConfigurationType.roleCatalogCollections</a:displayName>
<a:removed>true</a:removed>
<a:deprecatedSince>4.6</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -14614,7 +14614,7 @@
<a:displayName>RoleManagementConfigurationType.defaultCollection</a:displayName>
<a:removed>true</a:removed>
<a:deprecatedSince>4.6</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -16304,7 +16304,7 @@
<a:displayName>CleanupPoliciesType.objectResults</a:displayName>
<a:removed>true</a:removed>
<a:deprecatedSince>4.3</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -16942,7 +16942,7 @@
<xsd:appinfo>
<a:removed>true</a:removed>
<a:deprecatedSince>4.2</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/src/main/resources/xml/ns/public/common/common-correlation-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@
<xsd:appinfo>
<a:removed>true</a:removed>
<a:deprecatedSince>4.6</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down
18 changes: 9 additions & 9 deletions infra/schema/src/main/resources/xml/ns/public/common/common-gui-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<a:displayName>AdminGuiConfigurationType.objectForms</a:displayName>
<a:removed>true</a:removed>
<a:deprecatedSince>4.4</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -148,7 +148,7 @@
<a:displayName>AdminGuiConfigurationType.userDashboard</a:displayName>
<a:removed>true</a:removed>
<a:deprecatedSince>4.6</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -1232,7 +1232,7 @@
<a:displayName>GuiObjectDetailsPageType.forms</a:displayName>
<a:removed>true</a:removed>
<a:deprecatedSince>4.4</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -1250,7 +1250,7 @@
<xsd:appinfo>
<a:deprecatedSince>4.4</a:deprecatedSince>
<a:removed>true</a:removed>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -1998,7 +1998,7 @@
<a:experimental>true</a:experimental>
<a:deprecatedSince>4.4</a:deprecatedSince>
<a:removed>true</a:removed>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -2163,7 +2163,7 @@
<a:displayName>SearchBoxConfigurationType.defaultScope</a:displayName>
<a:since>3.9</a:since>
<a:removed>true</a:removed>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
<a:deprecatedSince>4.3</a:deprecatedSince>
</xsd:appinfo>
</xsd:annotation>
Expand All @@ -2181,7 +2181,7 @@
<a:displayName>SearchBoxConfigurationType.defaultObjectType</a:displayName>
<a:since>3.9</a:since>
<a:removed>true</a:removed>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
<a:deprecatedSince>4.3</a:deprecatedSince>
</xsd:appinfo>
</xsd:annotation>
Expand Down Expand Up @@ -3866,7 +3866,7 @@
<a:displayName>GuiActionType.name</a:displayName>
<a:removed>true</a:removed>
<a:deprecatedSince>4.6</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -3969,7 +3969,7 @@
<a:since>3.9</a:since>
<a:experimental>true</a:experimental>
<a:removed>true</a:removed>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
Expand Down
4 changes: 2 additions & 2 deletions infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@
<xsd:appinfo>
<a:objectReference>tns:accountPasswordPolicyRef</a:objectReference>
<a:removed>true</a:removed>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -528,7 +528,7 @@
<xsd:appinfo>
<a:objectReferenceTargetType>c:ValuePolicyType</a:objectReferenceTargetType>
<a:removed>true</a:removed>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down
12 changes: 6 additions & 6 deletions infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
<xsd:appinfo>
<a:displayName>TaskType.category</a:displayName>
<a:removed>true</a:removed>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -423,7 +423,7 @@
<xsd:appinfo>
<a:removed>true</a:removed>
<a:deprecatedSince>4.4</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -488,7 +488,7 @@
<xsd:appinfo>
<a:removed>true</a:removed>
<a:deprecatedSince>4.4</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -502,7 +502,7 @@
<xsd:appinfo>
<a:removed>true</a:removed>
<a:deprecatedSince>4.4</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -517,7 +517,7 @@
<a:since>4.3</a:since>
<a:removed>true</a:removed>
<a:deprecatedSince>4.4</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -4019,7 +4019,7 @@
<xsd:appinfo>
<a:removed>true</a:removed>
<a:deprecatedSince>4.3</a:deprecatedSince>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down
8 changes: 6 additions & 2 deletions infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,10 @@
Approvers that are expected to be part of this stage.
(Some might be "for sure" and some might be "expected", but currently we do not distinguish between these.)
</xsd:documentation>
<xsd:appinfo>
<a:removed>true</a:removed>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="executionPreview" type="c:ApprovalStageExecutionPreviewType" minOccurs="0">
Expand Down Expand Up @@ -418,7 +422,7 @@
<a:container/>
<a:since>3.7</a:since>
<a:removed>true</a:removed>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
Expand Down Expand Up @@ -654,7 +658,7 @@
<a:displayName>WfConfigurationType.useLegacyApproversSpecification</a:displayName>
<a:displayOrder>120</a:displayOrder>
<a:removed>true</a:removed>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
<a:minOccurs>0</a:minOccurs>
<a:maxOccurs>1</a:maxOccurs>
<a:removed>true</a:removed>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/src/main/resources/xml/ns/public/report/extension-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<a:minOccurs>0</a:minOccurs>
<a:maxOccurs>1</a:maxOccurs>
<a:removed>true</a:removed>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:removed>true</a:removed>
<a:plannedRemoval>5.0</a:plannedRemoval>
<a:removedSince>4.8</a:removedSince>
<a:container>true</a:container>
</xsd:appinfo>
</xsd:annotation>
Expand Down

0 comments on commit 9bbf9e8

Please sign in to comment.