From 870439300e7596d6833644ec9e6d1f38a1e0b6b5 Mon Sep 17 00:00:00 2001
From: Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>
Date: Tue, 14 May 2019 13:18:55 +0200
Subject: Implement Per-Field-Overriding of Configuration in Augmenter

- Rewrite DeliveryRequestAugmenter to allow per-field-overriding of
  configuration parameters and add test suite.
- Mzs schema change: Move DeliveryRequest/Server into
  DeliveryRequest/Config; Reason: DeliveryRequest/Config contains all
  parameters exclusively needed by moazs to execute the delivery
  request. The msg's server url belongs to this set of parameters.
- WIP: Add prototype implementation of MsgClient and move MsgClient to
  dedicated package.
- Refactor: move TnvzClient to dedicated package.
---
 src/main/resources/mzs/app2mzs.xsd | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/main/resources/mzs')

diff --git a/src/main/resources/mzs/app2mzs.xsd b/src/main/resources/mzs/app2mzs.xsd
index 9818d5a..e97e9b6 100644
--- a/src/main/resources/mzs/app2mzs.xsd
+++ b/src/main/resources/mzs/app2mzs.xsd
@@ -5,14 +5,6 @@
 	<xs:element name="DeliveryRequest" type="DeliveryRequestType"/>
 	<xs:complexType name="DeliveryRequestType">
 		<xs:sequence>
-			<xs:element name="Server" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ZUSEUrlID" type="xs:anyURI"/>
-						<xs:element name="X509" type="xs:base64Binary" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
 			<xs:element name="Sender">
 				<xs:complexType>
 					<xs:sequence>
@@ -88,7 +80,15 @@
 	<xs:element name="Config" type="ConfigType"/>
 	<xs:complexType name="ConfigType">
 		<xs:sequence>
-			<xs:element name="PerformQueryPersonRequest" type="xs:boolean"></xs:element>
+			<xs:element ref="Server" minOccurs="0"></xs:element>
+			<xs:element name="PerformQueryPersonRequest" type="xs:boolean" minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:element name="Server" type="ServerType" />
+	<xs:complexType name="ServerType">
+		<xs:sequence>
+			<xs:element name="ZUSEUrlID" type="xs:anyURI" minOccurs="0"/>
+			<xs:element name="X509" type="xs:base64Binary" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:element name="DeliveryResponse" type="msg:DeliveryRequestStatusType"/>
@@ -190,4 +190,5 @@
 			<xs:element ref="MZSDeliveryID"/>
 		</xs:sequence>
 	</xs:complexType>
+
 </xs:schema>
-- 
cgit v1.2.3