aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/zusetnvz
diff options
context:
space:
mode:
authorChristof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>2019-10-03 16:09:47 +0200
committerChristof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>2019-10-03 16:09:47 +0200
commitee8c694c12850b27144a664c948c3b84398ead6f (patch)
treec04076dee3a38f882d3fb810a85fbc6a9a104dfa /src/main/resources/zusetnvz
parentb3060f8ba40280d438e2b4b06b39aed84c587f7a (diff)
downloadmoa-zs-ee8c694c12850b27144a664c948c3b84398ead6f.tar.gz
moa-zs-ee8c694c12850b27144a664c948c3b84398ead6f.tar.bz2
moa-zs-ee8c694c12850b27144a664c948c3b84398ead6f.zip
Update zusemsg and zusetnvz to Newest Version & Accommodate Changes
Upgrade zusemsg 2.2.0 to 2.2.007: - msg:RelayedViaERV - Change from boolean to complex type (ervcode). - Move from msg:DeliveryRequestStatusType/Success into msg:DeliveryRequestStatusType, which affects Success, Error, and PartialSuccess. - Was removed from DeliveryNotificationType. - Change msg:DeliveryNotification/Answer from list to singleton. - Change msg:DeliveryRequestStatusType/PartialSuccess is to type AnswerType. - msg:DeliveryRequestStatusType and msg:DeliveryNotificationType receive the attribute ID (for signature referencing). - Add new optional element msg:AustrianAdressesOnly (IndicatorType) to DeliveryRequestType/Receiver/(choice sequence). - Add new optional element ClearingProfilID to DeliveryRequestType/Sender. - Add new element ERVConfirmedDelivery, which subsitutes msg:Answer and extends msg:AbstractOperation - Has element ErvCode (also new token256 type). - Has element ERVDeliveryTimestamp. - Add new optional element TargetIdentification of type p:IdentificationType to msg:DeliveryNotification/User/ as optional element. - Add new enumeration "System" to msg:DeliveryNotification/User/Role. - Rename type AustrianLanguageType from "AustrianEthicMinorityLanguageType" to "AustrianLanguageType" and add "DE" as value. - msg:Tags were unbounded, now they are limited to 20. - VersionNumberType: Patch version can have three digits. Upgrade zusetnvz 2.2.0 to 2.2.006: - Add StandardMimeTypeList to tnvz:QueryPersonResponse and tnvz:QueryAdressabilityResponse. - Add AllStandardMimeTypes (indicator) to tnvz:PersonResult/Success. - Add optional msg:MetadataList to tnvz:PersonQueryType/Metadata tnvz:AddressabilityQueryType/Metadata. - Move tnvz:AustrianAdressesOnly to msg namespace. Carry zusemsg changes into app2mzs interface: - Switch namespace of AustrianAdressesOnly from tnvz to msg. - Add new optional element ClearingProfilID to mzs:DeliveryRequestType/Sender; Reason: Element was added to zusemsg 2.2.007. - Add new choice in mzs:DeliveryNotification to forward new answer type msg:ERVConfirmedDelivery to the app. - Move msg:RelayedViaERV from SuccessType into MessageType (now it's available to all types that derive from MessageType). Accommodate zusemsg/tnvz changes in code base: - TNVZHelper: Consider StandardMimeTypeList when assessing if DeliveryRequest/mimetypes overlap with TNVZ's Accepted Mimetypes. - Msg2MzsConverter: - Put getRelayedViaERV() into all DeliveryStatusRequest replies. - Honor that Notification/Answer is Singleton instead of List. - Handle case were DeliveryNotification/Answer is of type ERVConfirmedDeliveryType. - Remove RelayedViaERV from DeliveryNotification as this element is not available anymore. - NotificationResponse: Honor that Notification/Answer is Singleton instead of List. Fix all testcases and sample soap messages to comply with schema changes.
Diffstat (limited to 'src/main/resources/zusetnvz')
-rw-r--r--src/main/resources/zusetnvz/ksb2tnvz_p2.wsdl5
-rw-r--r--src/main/resources/zusetnvz/zuse2tnvz_p2.wsdl4
-rw-r--r--src/main/resources/zusetnvz/zusenqd_p2.xsd10
-rw-r--r--src/main/resources/zusetnvz/zusetnvz_p2.xsd66
4 files changed, 55 insertions, 30 deletions
diff --git a/src/main/resources/zusetnvz/ksb2tnvz_p2.wsdl b/src/main/resources/zusetnvz/ksb2tnvz_p2.wsdl
index c3c1c6f..7948786 100644
--- a/src/main/resources/zusetnvz/ksb2tnvz_p2.wsdl
+++ b/src/main/resources/zusetnvz/ksb2tnvz_p2.wsdl
@@ -46,7 +46,7 @@
<wsdl:binding name="TnvzKsbPortSoap12" type="service:TnvzKsbPort">
<soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="GetVersion">
- <soap12:operation soapAction="GetVersion" soapActionRequired="false"/>
+ <soap12:operation soapAction="GetVersion" soapActionRequired="false" style="document"/>
<wsdl:input name="GetVersionRequest">
<soap12:body use="literal"/>
</wsdl:input>
@@ -55,7 +55,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="ImportNonQualifiedData">
- <soap12:operation soapAction="ImportNonQualifiedData" soapActionRequired="false"/>
+ <soap12:operation soapAction="ImportNonQualifiedData" soapActionRequired="false" style="document"/>
<wsdl:input name="ImportNonQualifiedDataRequest">
<soap12:body use="literal"/>
</wsdl:input>
@@ -72,7 +72,6 @@
<soap12:body use="literal"/>
</wsdl:output>
</wsdl:operation>
- <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
</wsdl:binding>
<wsdl:service name="TnvzKsbPortService">
<wsdl:port name="TnvzKsbPortSoap12" binding="service:TnvzKsbPortSoap12">
diff --git a/src/main/resources/zusetnvz/zuse2tnvz_p2.wsdl b/src/main/resources/zusetnvz/zuse2tnvz_p2.wsdl
index 9501552..2ba1eea 100644
--- a/src/main/resources/zusetnvz/zuse2tnvz_p2.wsdl
+++ b/src/main/resources/zusetnvz/zuse2tnvz_p2.wsdl
@@ -58,7 +58,7 @@
<wsdl:binding name="TNVZServicePortSoap12" type="service:TNVZServicePort">
<soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="GetVersion">
- <soap12:operation soapAction="GetVersion" soapActionRequired="false"/>
+ <soap12:operation soapAction="GetVersion" soapActionRequired="false" style="document"/>
<wsdl:input name="GetVersionRequest">
<soap12:body use="literal"/>
</wsdl:input>
@@ -67,7 +67,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="GetInfo">
- <soap12:operation soapAction="GetInfo" soapActionRequired="false"/>
+ <soap12:operation soapAction="GetInfo" soapActionRequired="false" style="document"/>
<wsdl:input name="GetInfoRequest">
<soap12:body use="literal"/>
</wsdl:input>
diff --git a/src/main/resources/zusetnvz/zusenqd_p2.xsd b/src/main/resources/zusetnvz/zusenqd_p2.xsd
index 5c31408..60a0c32 100644
--- a/src/main/resources/zusetnvz/zusenqd_p2.xsd
+++ b/src/main/resources/zusetnvz/zusenqd_p2.xsd
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Mit XMLSpy v2016 (http://www.altova.com) von Arne Tauber (TU Graz) bearbeitet -->
-<xs:schema xmlns:nqd="http://reference.e-government.gv.at/namespace/zustellung/tnvz/nonqualifieddata/phase2/20181206#" xmlns:p="http://reference.e-government.gv.at/namespace/persondata/phase2/20181206#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msg="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" targetNamespace="http://reference.e-government.gv.at/namespace/zustellung/tnvz/nonqualifieddata/phase2/20181206#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.2.0">
- <xs:import namespace="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#" schemaLocation="../zusemsg/zuse_p2.xsd"/>
+<xs:schema xmlns:nqd="http://reference.e-government.gv.at/namespace/zustellung/tnvz/nonqualifieddata/phase2/20181206#" xmlns:p="http://reference.e-government.gv.at/namespace/persondata/phase2/20181206#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msg="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" targetNamespace="http://reference.e-government.gv.at/namespace/zustellung/tnvz/nonqualifieddata/phase2/20181206#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.2.007">
+ <!--### ZUSE-Personendaten: namespace="http://reference.e-government.gv.at/namespace/persondata/phase2/20181206#" version="2.2.007" ###-->
<xs:import namespace="http://reference.e-government.gv.at/namespace/persondata/phase2/20181206#" schemaLocation="../zusemsg/zuse_mypersondata_en_p2.xsd"/>
+ <!--### ZUSE-Nachricht: namespace="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#" version="2.2.007" ###-->
+ <xs:import namespace="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#" schemaLocation="../zusemsg/zuse_p2.xsd"/>
<!--********* Definition der Request- und Response-Elemente ***********-->
<!--*** Abfrage der Webserviceversion ***-->
<xs:element name="GetVersionRequest" type="msg:SimpleRequestType"/>
@@ -12,7 +14,7 @@
<xs:element name="Version">
<xs:simpleType>
<xs:restriction base="xs:token">
- <xs:enumeration value="2.2.0"/>
+ <xs:enumeration value="2.2.007"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -75,7 +77,7 @@
<xs:documentation>Zustellsystem, welches die Löschung durchführt</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="tnvzDeleteEntryList">
+ <xs:element name="DeleteEntryList">
<xs:annotation>
<xs:documentation>Liste der von einer (Daten-)Löschung betroffenen Teilnehmer</xs:documentation>
</xs:annotation>
diff --git a/src/main/resources/zusetnvz/zusetnvz_p2.xsd b/src/main/resources/zusetnvz/zusetnvz_p2.xsd
index 3fba91c..81c9082 100644
--- a/src/main/resources/zusetnvz/zusetnvz_p2.xsd
+++ b/src/main/resources/zusetnvz/zusetnvz_p2.xsd
@@ -1,8 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Mit XMLSpy v2016 (http://www.altova.com) von Arne Tauber (TU Graz) bearbeitet -->
-<xs:schema xmlns:tnvz="http://reference.e-government.gv.at/namespace/zustellung/tnvz/phase2/20181206#" xmlns:p="http://reference.e-government.gv.at/namespace/persondata/phase2/20181206#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msg="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" targetNamespace="http://reference.e-government.gv.at/namespace/zustellung/tnvz/phase2/20181206#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.2.0">
- <xs:import namespace="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#" schemaLocation="../zusemsg/zuse_p2.xsd"/>
+<!-- ###
+
+ Die Versionsnummer des Schemas wird immer dann hochgezogen, wenn das Schema
+ selbst verändert wurde aber auch dann, wenn zumindest eines der importierten
+ ZUSE-Schemata angepasst wurde.
+
+ ###-->
+<xs:schema xmlns:tnvz="http://reference.e-government.gv.at/namespace/zustellung/tnvz/phase2/20181206#" xmlns:p="http://reference.e-government.gv.at/namespace/persondata/phase2/20181206#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msg="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" targetNamespace="http://reference.e-government.gv.at/namespace/zustellung/tnvz/phase2/20181206#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.2.007">
+ <!--### Imports ###-->
+ <!--### ZUSE-Personendaten: namespace="http://reference.e-government.gv.at/namespace/persondata/phase2/20181206#" version="2.2.007" ###-->
<xs:import namespace="http://reference.e-government.gv.at/namespace/persondata/phase2/20181206#" schemaLocation="../zusemsg/zuse_mypersondata_en_p2.xsd"/>
+ <!--### ZUSE-Nachricht: namespace="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#" version="2.2.007" ###-->
+ <xs:import namespace="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#" schemaLocation="../zusemsg/zuse_p2.xsd"/>
<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="../zusemsg/W3C-XMLDSig.xsd"/>
<xs:import namespace="http://www.w3.org/2001/04/xmlenc#" schemaLocation="../zusemsg/xenc-schema.xsd"/>
<!--******** Definition der Request- und Response-Elemente ********-->
@@ -14,7 +24,7 @@
<xs:element name="Version">
<xs:simpleType>
<xs:restriction base="xs:token">
- <xs:enumeration value="2.2.0"/>
+ <xs:enumeration value="2.2.006"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -60,13 +70,16 @@
<xs:element name="QueryPersonResponse">
<xs:complexType>
<xs:choice>
- <xs:element name="QueryResultList">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="QueryResult" type="tnvz:PersonResultType" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:sequence>
+ <xs:element ref="tnvz:StandardMimeTypeList"/>
+ <xs:element name="QueryResultList">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="QueryResult" type="tnvz:PersonResultType" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
<xs:element ref="tnvz:Error"/>
</xs:choice>
</xs:complexType>
@@ -91,13 +104,16 @@
<xs:element name="QueryAddressabilityResponse">
<xs:complexType>
<xs:choice>
- <xs:element name="QueryResultList">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="QueryResult" type="tnvz:AddressabilityResultType" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:sequence>
+ <xs:element ref="tnvz:StandardMimeTypeList"/>
+ <xs:element name="QueryResultList">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="QueryResult" type="tnvz:AddressabilityResultType" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
<xs:element ref="tnvz:Error"/>
</xs:choice>
</xs:complexType>
@@ -126,6 +142,7 @@
</xs:choice>
<xs:element ref="msg:PreAdviceNote" minOccurs="0"/>
<xs:element ref="msg:IgnorePostRedirectionOrder" minOccurs="0"/>
+ <xs:element ref="msg:MetadataList" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -153,6 +170,7 @@
<xs:complexType name="PersonResultSuccessType">
<xs:sequence>
<xs:element ref="p:Identification"/>
+ <xs:element name="AllStandardMimeTypes" type="msg:IndicatorType" minOccurs="0"/>
<xs:element ref="tnvz:MimeTypeList" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
@@ -184,6 +202,7 @@
</xs:choice>
<xs:element ref="msg:PreAdviceNote" minOccurs="0"/>
<xs:element ref="msg:IgnorePostRedirectionOrder" minOccurs="0"/>
+ <xs:element ref="msg:MetadataList" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -238,7 +257,7 @@
<xs:element ref="p:Identification"/>
<xs:sequence>
<xs:element ref="p:Person"/>
- <xs:element ref="tnvz:AustrianAddressesOnly" minOccurs="0"/>
+ <xs:element ref="msg:AustrianAddressesOnly" minOccurs="0"/>
<xs:element ref="msg:NotificationAddressList" minOccurs="0">
<xs:annotation>
<xs:documentation>Ein oder mehrere Verständigungsadressen mit deren Hilfe der Empfänger eindeutig bestimmt werden soll</xs:documentation>
@@ -253,18 +272,23 @@
</xs:choice>
</xs:complexType>
</xs:element>
- <xs:element name="AustrianAddressesOnly" type="msg:IndicatorType">
+ <xs:element name="StandardMimeTypeList" type="tnvz:MimeTypeListType">
<xs:annotation>
- <xs:documentation>Die Existenz des Elements zeigt an, dass die gesuchte Person in Österreich gemeldet sein muss</xs:documentation>
+ <xs:documentation>Liste der üblichen Formaten, die der Teilnehmer jedenfalls akzeptieren muss und nicht abwählen kann. (Ausnahme: der ERV verarbeitet nur für die Langzeitarchivung geeignete PDF Formate)</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:complexType name="MimeTypeListType">
+ <xs:sequence>
+ <xs:element ref="msg:MimeType" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
<xs:element name="MimeTypeList">
<xs:annotation>
<xs:documentation>Liste der Dateiformate, die vom Empfänger neben den üblichen Formaten unterstützt werden </xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
- <xs:element ref="msg:MimeType" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="msg:MimeType" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>