diff options
| author | Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at> | 2019-04-09 09:08:58 +0200 |
|---|---|---|
| committer | Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at> | 2019-04-09 09:11:26 +0200 |
| commit | eaa2485479b9ece8014eb51be4759606c911d246 (patch) | |
| tree | 79487e31a91027d43115785a271b7d71700f521a | |
| parent | b3b843ee77dea45c13440e0de834d813fbf77053 (diff) | |
| download | moa-zs-eaa2485479b9ece8014eb51be4759606c911d246.tar.gz moa-zs-eaa2485479b9ece8014eb51be4759606c911d246.tar.bz2 moa-zs-eaa2485479b9ece8014eb51be4759606c911d246.zip | |
Propagate changes of zusemsg2.0.c into mzs
- Add Target to CorporateBodyType
- Remove Authority
- make DateOfBirth optional
| -rw-r--r-- | src/main/resources/mzs/mzs_mypersondata_en.xsd | 18 | ||||
| -rw-r--r-- | src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/validDeliveryRequest.soap | 4 |
2 files changed, 4 insertions, 18 deletions
diff --git a/src/main/resources/mzs/mzs_mypersondata_en.xsd b/src/main/resources/mzs/mzs_mypersondata_en.xsd index 756669f..ac07ddb 100644 --- a/src/main/resources/mzs/mzs_mypersondata_en.xsd +++ b/src/main/resources/mzs/mzs_mypersondata_en.xsd @@ -17,7 +17,6 @@ <!-- ### physical person and corporate body ### --> <xs:element name="PhysicalPerson" type="PhysicalPersonType" substitutionGroup="Person" /> <xs:element name="CorporateBody" type="CorporateBodyType" substitutionGroup="Person" /> - <xs:element name="Authority" type="AuthorityType" substitutionGroup="Person" /> <xs:element name="Name" type="PersonNameType"> <xs:annotation> <xs:documentation>data related to the person's name</xs:documentation> @@ -108,7 +107,7 @@ <xs:extension base="AbstractPersonType"> <xs:sequence> <xs:element ref="Name"/> - <xs:element ref="DateOfBirth"/> + <xs:element ref="DateOfBirth" minOccurs="0"/> </xs:sequence> </xs:extension> </xs:complexContent> @@ -169,20 +168,6 @@ </xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="AuthorityType"> - <xs:annotation> - <xs:documentation>public authority</xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="AbstractPersonType"> - <xs:sequence> - <xs:element ref="FullName"/> - <xs:element ref="Organization" minOccurs="0"/> - <xs:element ref="Target" minOccurs="0"/> - </xs:sequence> - </xs:extension> - </xs:complexContent> - </xs:complexType> <xs:element name="FullName" type="xs:token"> <xs:annotation> <xs:documentation>name of corporate body (whole name), compare VollerName</xs:documentation> @@ -215,6 +200,7 @@ <xs:documentation>part of an organisation, see also X.500 ou (eg departement, section, branch, ...) , compare Organisation</xs:documentation> </xs:annotation> </xs:element> + <xs:element ref="Target" minOccurs="0"/> </xs:sequence> </xs:extension> </xs:complexContent> diff --git a/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/validDeliveryRequest.soap b/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/validDeliveryRequest.soap index 91c0d61..5254540 100644 --- a/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/validDeliveryRequest.soap +++ b/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/validDeliveryRequest.soap @@ -9,9 +9,9 @@ <soapenv:Body> <mzs:DeliveryRequest> <mzs:Sender> - <p:Authority> + <p:CorporateBody> <p:FullName>Bundesministerium für Testzwecke</p:FullName> - </p:Authority> + </p:CorporateBody> <mzs:WebserviceURL>https://authority.gv.at/delivery_notification</mzs:WebserviceURL> </mzs:Sender> <mzs:Receiver> |