From 896195cc9b287a3f41008cc85997b9c2209120b8 Mon Sep 17 00:00:00 2001
From: Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>
Date: Tue, 16 Jul 2019 16:53:41 +0200
Subject: DeliveryNotification: Change Mzs Schema, Convert From Msg to Mzs

Mzs Schema Changes:
- Formerly: The mzs:DeliveryNotificationType is a choice between
  Success And Error; Change: Wrap choice in a sequence. Reason: msg
  2.0.0 adds fields that fit best in this sequence. Adding new fields
  to Success or Error duplicates code, whereas adding it to the base
  type (which is MessageType) also affects mzs:DeliveryRequestStatus.
- Add msg:SenderDetails, ReceiverDetails, user, AdditionalFormat,
  NotificationsPerformed; Reason: It was added to zusemsg 2.0.0.
---
 src/main/resources/mzs/app2mzs.xsd | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'src/main/resources')

diff --git a/src/main/resources/mzs/app2mzs.xsd b/src/main/resources/mzs/app2mzs.xsd
index a2d1bde..da49631 100644
--- a/src/main/resources/mzs/app2mzs.xsd
+++ b/src/main/resources/mzs/app2mzs.xsd
@@ -166,10 +166,25 @@
 		</xs:annotation>
 	</xs:element>
 	<xs:complexType name="DeliveryNotificationType">
-		<xs:choice>
-			<xs:element ref="Success"/>
-			<xs:element ref="Error"/>
-		</xs:choice>
+		<xs:sequence>
+			<xs:choice>
+				<xs:element ref="Success"/>
+				<xs:element ref="Error"/>
+			</xs:choice>
+			<xs:element ref="msg:SenderDetails"/>
+			<xs:element ref="msg:ReceiverDetails"/>
+			<xs:element ref="msg:User" minOccurs="0" />
+			<xs:element name="AdditionalFormat" minOccurs="0" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:base64Binary">
+							<xs:attribute name="Type" type="xs:token" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element ref="msg:NotificationsPerformed" minOccurs="0"/>
+		</xs:sequence>
 	</xs:complexType>
   <xs:element name="DeliveryRequestStatusACK" type="DeliveryNotificationACKType" />
 	<xs:element name="DeliveryNotificationACK" type="DeliveryNotificationACKType">
-- 
cgit v1.2.3