diff options
author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2014-03-03 16:54:37 +0100 |
---|---|---|
committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2014-03-03 16:54:37 +0100 |
commit | 269cee30ed94b35b9c774470e590c03f92186e8a (patch) | |
tree | d2a0ab982379626ba8f2c237dde2d8c84a80d554 /src/main/resources | |
parent | defceef8afef538555c13d33e344a89a828a3d97 (diff) | |
download | egovutils-269cee30ed94b35b9c774470e590c03f92186e8a.tar.gz egovutils-269cee30ed94b35b9c774470e590c03f92186e8a.tar.bz2 egovutils-269cee30ed94b35b9c774470e590c03f92186e8a.zip |
update SZRGW client
update MIS-STORK client
Diffstat (limited to 'src/main/resources')
-rw-r--r-- | src/main/resources/wsdl/custom-bindings/stork.xml | 14 | ||||
-rw-r--r-- | src/main/resources/wsdl/custom-bindings/szrgw-schemas.xml | 10 | ||||
-rw-r--r-- | src/main/resources/wsdl/mis/mis-1.0.3.xsd | 19 | ||||
-rw-r--r-- | src/main/resources/wsdl/misstork/misstork-1.0.xsd | 16 | ||||
-rw-r--r-- | src/main/resources/wsdl/szrgw/stork.xsd | 62 | ||||
-rw-r--r-- | src/main/resources/wsdl/szrgw/szr-gw-0.0.3.xsd | 42 |
6 files changed, 101 insertions, 62 deletions
diff --git a/src/main/resources/wsdl/custom-bindings/stork.xml b/src/main/resources/wsdl/custom-bindings/stork.xml new file mode 100644 index 0000000..01bd26b --- /dev/null +++ b/src/main/resources/wsdl/custom-bindings/stork.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<bindings version="2.0" xmlns="http://java.sun.com/xml/ns/jaxb" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"> + + <bindings schemaLocation="../szrgw/stork.xsd"> + <bindings node="/xsd:schema"> + <schemaBindings> + <package name="at.gv.util.xsd.stork"/> + </schemaBindings> + </bindings> + </bindings> + +</bindings>
\ No newline at end of file diff --git a/src/main/resources/wsdl/custom-bindings/szrgw-schemas.xml b/src/main/resources/wsdl/custom-bindings/szrgw-schemas.xml index 7388e8e..3a10098 100644 --- a/src/main/resources/wsdl/custom-bindings/szrgw-schemas.xml +++ b/src/main/resources/wsdl/custom-bindings/szrgw-schemas.xml @@ -18,15 +18,7 @@ </schemaBindings> </bindings> </bindings> - - <bindings schemaLocation="../szrgw/stork.xsd"> - <bindings node="/xsd:schema"> - <schemaBindings> - <package name="at.gv.util.xsd.stork"/> - </schemaBindings> - </bindings> - </bindings> - + <bindings schemaLocation="../PersonData_20_en_moaWID.xsd"> <bindings node="/xsd:schema"> <schemaBindings> diff --git a/src/main/resources/wsdl/mis/mis-1.0.3.xsd b/src/main/resources/wsdl/mis/mis-1.0.3.xsd index 1a3fb14..0369145 100644 --- a/src/main/resources/wsdl/mis/mis-1.0.3.xsd +++ b/src/main/resources/wsdl/mis/mis-1.0.3.xsd @@ -29,14 +29,7 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="Target" minOccurs="0"> - <xs:complexType> - <xs:sequence> - <xs:element name="Type" type="xs:anyURI" minOccurs="1"/> - <xs:element name="Value" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> + <xs:element ref="Target" minOccurs="0" maxOccurs="1"/> </xs:sequence> <xs:element name="SessionID" type="xs:string"/> </xs:choice> @@ -47,7 +40,15 @@ <xs:element name="MandateIdentifier" type="xs:string"/> </xs:sequence> </xs:complexType> - </xs:element> + </xs:element> + <xs:element name="Target"> + <xs:complexType> + <xs:sequence> + <xs:element name="Type" type="xs:anyURI" minOccurs="1"/> + <xs:element name="Value" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="MandateIssueResponse" type="MandateIssueResponseType"> <xs:annotation> <xs:documentation>Response from MIS</xs:documentation> diff --git a/src/main/resources/wsdl/misstork/misstork-1.0.xsd b/src/main/resources/wsdl/misstork/misstork-1.0.xsd index 9205483..68d62b8 100644 --- a/src/main/resources/wsdl/misstork/misstork-1.0.xsd +++ b/src/main/resources/wsdl/misstork/misstork-1.0.xsd @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Mit XMLSpy v2013 sp1 (http://www.altova.com) von Thomas Lenz (Graz University of Technology IAIK) bearbeitet --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ms="http://reference.e-government.gv.at/namespace/misstork/20131126/xsd" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:mis="http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd" targetNamespace="http://reference.e-government.gv.at/namespace/misstork/20131126/xsd" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.0.1"> <xs:import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" schemaLocation="../PersonData_20_en_moaWID.xsd"/> <xs:import namespace="http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd" schemaLocation="../mis/mis-1.0.3.xsd"/> @@ -8,16 +9,23 @@ <xs:sequence> <xs:element name="StorkMandateType" type="xs:integer" minOccurs="1"/> <xs:element ref="ms:MandatorType" minOccurs="1" maxOccurs="1"/> - <xs:element ref="mis:MandateIdentifiers" minOccurs="0"/> + <xs:element name="Filters" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element ref="mis:MandateIdentifiers" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element ref="mis:Target" minOccurs="0" maxOccurs="1"/> + <xs:element name="OAFriendlyName" type="xs:string" minOccurs="1" maxOccurs="1"/> </xs:sequence> <xs:sequence> <xs:element ref="ms:ReferenceValue" minOccurs="1" maxOccurs="1"/> - <xs:element name="MISMandateType" type="xs:string" minOccurs="1" maxOccurs="1"/> <xs:element name="Mandator"> <xs:complexType> <xs:choice> <xs:sequence> - <xs:element ref="pr:PhysicalPerson" minOccurs="1" maxOccurs="1"/> + <xs:element name="IdentityLink" type="xs:base64Binary" minOccurs="1" maxOccurs="1"/> </xs:sequence> <xs:sequence> <xs:element ref="pr:CorporateBody" minOccurs="1" maxOccurs="1"/> @@ -28,7 +36,7 @@ <xs:element name="Representative"> <xs:complexType> <xs:sequence> - <xs:element ref="pr:PhysicalPerson" minOccurs="1" maxOccurs="1"/> + <xs:element name="IdentityLink" type="xs:base64Binary" minOccurs="1" maxOccurs="1"/> </xs:sequence> </xs:complexType> </xs:element> diff --git a/src/main/resources/wsdl/szrgw/stork.xsd b/src/main/resources/wsdl/szrgw/stork.xsd index fa216ca..10f0f56 100644 --- a/src/main/resources/wsdl/szrgw/stork.xsd +++ b/src/main/resources/wsdl/szrgw/stork.xsd @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:stork="urn:eu:stork:names:tc:PEPS:1.0:assertion" targetNamespace="urn:eu:stork:names:tc:PEPS:1.0:assertion" elementFormDefault="qualified" attributeFormDefault="unqualified"> + <xs:element name="representative" type="stork:representationPerson"/> + <xs:element name="represented" type="stork:representationPerson" /> <xs:complexType name="representationPerson"> <xs:choice> <xs:sequence> @@ -7,39 +9,51 @@ <xs:element name="givenName" type="xs:string" minOccurs="1" maxOccurs="1"/> <xs:element name="surname" type="xs:string" minOccurs="1" maxOccurs="1"/> <xs:element name="dateOfBirth" type="xs:date" minOccurs="1" maxOccurs="1"/> - <xs:element name="fiscalNumber" type="xs:string" minOccurs="0" maxOccurs="1"/> </xs:sequence> <xs:sequence> <xs:element name="eLPIdentifier" type="xs:string" minOccurs="1" maxOccurs="1"/> <xs:element name="legalName" type="xs:string" minOccurs="1" maxOccurs="1"/> - <xs:element name="canonicalRegisteredAddress" type="stork:canonicalAddressType" minOccurs="1" maxOccurs="1"/> + <xs:element name="adress" type="xs:string" minOccurs="1" maxOccurs="1"/> <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="1"/> - <xs:element name="translatableType" type="xs:string" minOccurs="1" maxOccurs="1"/> - <xs:element name="LPfiscalNumber" type="xs:string" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:choice> </xs:complexType> - <xs:complexType name="mandateContent"> - <xs:sequence> - <xs:element name="validFrom" type="xs:date" minOccurs="0" maxOccurs="1"/> - <xs:element name="validTo" type="xs:date" minOccurs="0" maxOccurs="1"/> - <xs:element name="isJoint" type="xs:integer" minOccurs="0" maxOccurs="1"/> - <xs:element name="isChained" type="xs:boolean" minOccurs="0" maxOccurs="1"/> - <xs:element name="typePower" type="xs:integer" minOccurs="1" maxOccurs="1"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="canonicalAddressType"> - <xs:sequence> - <xs:element ref="stork:countryCodeAddress"/> - <xs:element name="state" type="xs:string" minOccurs="1" maxOccurs="1"/> - <xs:element name="municipalityCode" type="xs:string" minOccurs="0"/> - <xs:element name="town" type="xs:string" minOccurs="1" maxOccurs="1"/> - <xs:element name="postalCode" type="xs:string" minOccurs="1" maxOccurs="1"/> - <xs:element name="streetName" type="xs:string" minOccurs="1" maxOccurs="1"/> - <xs:element name="streetNumber" type="xs:string" minOccurs="0"/> - <xs:element name="apartmentNumber" type="xs:string" minOccurs="0"/> - </xs:sequence> + + <xs:element name="mandateContent"> + <xs:complexType> + <xs:sequence> + <xs:element name="validFrom" type="xs:date" minOccurs="0" maxOccurs="1"/> + <xs:element name="validTo" type="xs:date" minOccurs="0" maxOccurs="1"/> + <xs:element name="transactionLimit" type="xs:integer" minOccurs="0" maxOccurs="1"/> + <xs:element ref="stork:transactionLimitCurrency"/> + <xs:element name="isJoint" type="xs:integer" minOccurs="0" maxOccurs="1"/> + <xs:element name="isChained" type="xs:boolean" minOccurs="0" maxOccurs="1"/> + <xs:element name="typePower" type="xs:integer" minOccurs="1" maxOccurs="1"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="transactionLimitCurrency"/> + <xs:simpleType name="currency"> + <xs:restriction base="xs:string"> + <xs:maxLength value="3"/> + <xs:minLength value="3"/> + </xs:restriction> + </xs:simpleType> + + <xs:element name="canonicalResidenceAddress"> + <xs:complexType> + <xs:sequence> + <xs:element ref="stork:countryCodeAddress"/> + <xs:element name="state" type="xs:string" minOccurs="1" maxOccurs="1"/> + <xs:element name="municipalityCode" type="xs:string" minOccurs="0"/> + <xs:element name="town" type="xs:string" minOccurs="1" maxOccurs="1"/> + <xs:element name="postalCode" type="xs:string" minOccurs="1" maxOccurs="1"/> + <xs:element name="streetName" type="xs:string" minOccurs="1" maxOccurs="1"/> + <xs:element name="streetNumber" type="xs:string" minOccurs="0"/> + <xs:element name="apartmentNumber" type="xs:string" minOccurs="0"/> + </xs:sequence> </xs:complexType> + </xs:element> <xs:element name="countryCodeAddress"> <xs:simpleType> <xs:restriction base="xs:string"> diff --git a/src/main/resources/wsdl/szrgw/szr-gw-0.0.3.xsd b/src/main/resources/wsdl/szrgw/szr-gw-0.0.3.xsd index 8ff05a9..c978224 100644 --- a/src/main/resources/wsdl/szrgw/szr-gw-0.0.3.xsd +++ b/src/main/resources/wsdl/szrgw/szr-gw-0.0.3.xsd @@ -3,7 +3,6 @@ <xs:import namespace="urn:oasis:names:tc:SAML:1.0:assertion" schemaLocation="../cs-sstc-schema-assertion-01.xsd"/> <xs:import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" schemaLocation="../PersonData_20_en_moaWID.xsd"/> <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="../W3C-XMLDSig.xsd"/> - <xs:import namespace="urn:eu:stork:names:tc:PEPS:1.0:assertion" schemaLocation="stork.xsd"/> <xs:import namespace="http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd" schemaLocation="../mis/mis-1.0.3.xsd"/> <xs:element name="CreateIdentityLinkRequest"> <xs:complexType> @@ -11,27 +10,38 @@ <xs:element name="PEPSData" minOccurs="0" maxOccurs="1"> <xs:complexType> <xs:sequence> - <xs:element name="Identifier" type="xs:string" minOccurs="1" maxOccurs="1"/> - <xs:element name="Firstname" type="xs:string" minOccurs="1" maxOccurs="1"/> - <xs:element name="Familyname" type="xs:string" minOccurs="1" maxOccurs="1"/> - <xs:element name="DateOfBirth" type="sgw:DateOfBirthType" minOccurs="1" maxOccurs="1"/> - <xs:element name="Representative" type="stork:representationPerson" minOccurs="0" maxOccurs="1"/> - <xs:element name="Represented" type="stork:representationPerson" minOccurs="0" maxOccurs="1"/> - <xs:element name="MandateContent" type="stork:mandateContent" minOccurs="0" maxOccurs="1"/> + <xs:element name="Identifier" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="Firstname" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="Familyname" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="DateOfBirth" type="sgw:DateOfBirthType" minOccurs="0" maxOccurs="1"/> + <xs:element name="Gender" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="FiscalNumber" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="LegalPersonTranslatableType" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="LegalPersonCanonicalRegisteredAddress" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="Representative" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="Represented" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="MandateContent" type="xs:string" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="Signature"> - <xs:complexType> - <xs:sequence> - <xs:element name="Base64Content" type="xs:base64Binary" minOccurs="1"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element ref="mis:MandateIdentifiers" minOccurs="0"/> + <xs:element name="Signature" type="xs:base64Binary" minOccurs="1" maxOccurs="1"/> + <xs:element name="MIS" type="sgw:MISType" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:complexType> </xs:element> + <xs:complexType name="MISType"> + <xs:sequence> + <xs:element name="Filters" minOccurs="1" maxOccurs="1"> + <xs:complexType> + <xs:sequence> + <xs:element ref="mis:MandateIdentifiers" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element ref="mis:Target" minOccurs="0" maxOccurs="1"/> + <xs:element name="OAFriendlyName" type="xs:string" minOccurs="1" maxOccurs="1"/> + </xs:sequence> + </xs:complexType> <xs:element name="CreateIdentityLinkResponse"> <xs:annotation> <xs:documentation>Antwort auf Personenbindung-Request</xs:documentation> |