MID-7484: schema, legacy transports are not containers anymore

Containers with name attribute caused problems for TestCryptoUtil, so did container for mail server config, all is reverted to non-containers.
Evolveum · Feb 18, 2022 · 2a401bd · 2a401bd
1 parent 6e90ca3
commit 2a401bd
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
@@ -280,7 +280,6 @@
                 DEPRECATED: Use new messageTransportConfiguration instead.
             </xsd:documentation>
             <xsd:appinfo>
-                <a:container/>
                 <a:deprecated>true</a:deprecated>
                 <a:deprecatedSince>4.5</a:deprecatedSince>
                 <a:plannedRemoval>4.6</a:plannedRemoval>
@@ -382,7 +381,6 @@
                 DEPRECATED: Use new messageTransportConfiguration instead.
             </xsd:documentation>
             <xsd:appinfo>
-                <a:container/>
                 <a:displayName>MailConfigurationType.details</a:displayName>
                 <a:deprecated>true</a:deprecated>
                 <a:deprecatedSince>4.5</a:deprecatedSince>
@@ -421,7 +419,8 @@
                 Configuration of a particular mail server host.
             </xsd:documentation>
             <xsd:appinfo>
-                <a:container/>
+                <!--TODO: causes NPE TestCryptoUtil in mail.getServer().get(0).getPassword() returns value that returns null for getEncryptedDataType() -->
+                <!--<a:container/>-->
                 <a:displayName>MailServerConfigurationType.details</a:displayName>
             </xsd:appinfo>
         </xsd:annotation>
@@ -545,7 +544,6 @@
                 Where and how to send SMS notifications (or any other SMS).
             </xsd:documentation>
             <xsd:appinfo>
-                <a:container/>
                 <a:deprecated>true</a:deprecated>
                 <a:deprecatedSince>4.5</a:deprecatedSince>
                 <a:plannedRemoval>4.6</a:plannedRemoval>
@@ -580,7 +578,6 @@
                 Where and how to store "file" notifications.
             </xsd:documentation>
             <xsd:appinfo>
-                <a:container/>
                 <a:displayName>FileConfigurationType.details</a:displayName>
                 <a:deprecated>true</a:deprecated>
                 <a:deprecatedSince>4.5</a:deprecatedSince>
@@ -611,7 +608,6 @@
                 TODO
             </xsd:documentation>
             <xsd:appinfo>
-                <a:container/>
                 <a:deprecated>true</a:deprecated>
                 <a:deprecatedSince>4.5</a:deprecatedSince>
                 <a:plannedRemoval>4.6</a:plannedRemoval>