aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/mzs
diff options
context:
space:
mode:
authorChristof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>2019-07-02 14:19:41 +0200
committerChristof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>2019-07-02 14:19:41 +0200
commit030488bb7ff9572f35032d80d4101c06cfc98bf5 (patch)
tree20c563d181a4afe755daed7ec7cc91341a9815ab /src/main/resources/mzs
parent45c717760a6efc74f4f15dbc3f55bafc5e9a02d9 (diff)
downloadmoa-zs-030488bb7ff9572f35032d80d4101c06cfc98bf5.tar.gz
moa-zs-030488bb7ff9572f35032d80d4101c06cfc98bf5.tar.bz2
moa-zs-030488bb7ff9572f35032d80d4101c06cfc98bf5.zip
Implement And Integrate tnvz:QueryPersonRequest.
- Merge TnvzClient and TnvzResultVerifier to TnvzHelper; TnvzHelper now builds the QueryPersonRequest, sends it to the tnvz port and evaluates the result. - Publish some interfaces in Mzs2MsgConverter because they are needed by TnvzHelper. - Generalize MsgClientFactory to ClientFactory such that it can be used to generate arbitrary SOAP clients (e.g. also for tnvz!). Schema Changes to accomodate Tnvz's QueryPersonRequest: - Add optional tnvz:AustrianAddressesOnly and optional TnvzMetaData to mzs:mzs:DeliveryRequest. Removed Unit Tests: - Remove subset of SameThreadDeliveryPipeline testcases (mimetype related) because its logic moved to TnvzHelper.
Diffstat (limited to 'src/main/resources/mzs')
-rw-r--r--src/main/resources/mzs/app2mzs.xsd17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/main/resources/mzs/app2mzs.xsd b/src/main/resources/mzs/app2mzs.xsd
index d99b248..193785a 100644
--- a/src/main/resources/mzs/app2mzs.xsd
+++ b/src/main/resources/mzs/app2mzs.xsd
@@ -1,7 +1,8 @@
<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:p="http://reference.e-government.gv.at/namespace/zustellung/mzs/persondata#" xmlns="http://reference.e-government.gv.at/namespace/zustellung/mzs/app2mzs#" targetNamespace="http://reference.e-government.gv.at/namespace/zustellung/mzs/app2mzs#" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:msg="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:p="http://reference.e-government.gv.at/namespace/zustellung/mzs/persondata#" xmlns="http://reference.e-government.gv.at/namespace/zustellung/mzs/app2mzs#" targetNamespace="http://reference.e-government.gv.at/namespace/zustellung/mzs/app2mzs#" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:msg="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#" xmlns:tnvz="http://reference.e-government.gv.at/namespace/zustellung/tnvz/phase2/20181206#">
<xs:import namespace="http://reference.e-government.gv.at/namespace/zustellung/mzs/persondata#" schemaLocation="mzs_mypersondata_en.xsd"/>
<xs:import namespace="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#" schemaLocation="../zusemsg/zuse_p2.xsd"/>
+ <xs:import namespace="http://reference.e-government.gv.at/namespace/zustellung/tnvz/phase2/20181206#" schemaLocation="../zusetnvz/zusetnvz_p2.xsd"/>
<xs:element name="DeliveryRequest" type="DeliveryRequestType"/>
<xs:complexType name="DeliveryRequestType">
<xs:sequence>
@@ -46,6 +47,7 @@
<xs:element name="Identification" type="p:IdentificationType" />
<xs:sequence>
<xs:element ref="p:Person"/>
+ <xs:element ref="tnvz:AustrianAddressesOnly" minOccurs="0"/>
<xs:element ref="p:Address" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:choice>
@@ -54,6 +56,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element ref="TnvzMetaData" minOccurs="0"/>
<xs:element ref="msg:MetaData" />
<xs:element name="Payload" maxOccurs="unbounded">
<xs:complexType>
@@ -77,6 +80,18 @@
<xs:element ref="Config" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
+ <xs:element name="TnvzMetaData" type="TnvzMetaDataType" />
+ <xs:complexType name="TnvzMetaDataType">
+ <xs:sequence>
+ <xs:element ref="msg:Origin" />
+ <xs:choice>
+ <xs:element ref="msg:DeliveryQuality"/>
+ <xs:element ref="msg:PrivateMessageQuality"/>
+ </xs:choice>
+ <xs:element ref="msg:PreAdviceNote" minOccurs="0"/>
+ <xs:element ref="msg:IgnorePostRedirectionOrder" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
<xs:element name="Config" type="ConfigType"/>
<xs:complexType name="ConfigType">
<xs:sequence>