update PVP 1.9 Header schema

1 files changed, 36 insertions, 45 deletions

diff --git a/src/main/resources/wsdl/szr/szr_pvp.xsd b/src/main/resources/wsdl/szr/szr_pvp.xsd
index accb9dd..a536c47 100644
--- a/src/main/resources/wsdl/szr/szr_pvp.xsd
+++ b/src/main/resources/wsdl/szr/szr_pvp.xsd
@@ -1,30 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://egov.gv.at/pvp1.xsd" xmlns="http://egov.gv.at/pvp1.xsd"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
-	attributeFormDefault="unqualified">
-	<xs:element name="pvpToken" type="pvpTokenType" />
+<xs:schema xmlns="http://egov.gv.at/pvp1.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://egov.gv.at/pvp1.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:element name="pvpToken" type="pvpTokenType"/>
 	<xs:complexType name="pvpTokenType">
 		<xs:sequence>
 			<xs:element name="authenticate">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element name="participantId" />
-						<xs:element name="gvOuDomain" minOccurs="0" />
+						<xs:element name="participantId" type="xs:string"/>
+						<xs:element name="gvOuDomain" minOccurs="0" type="xs:string"/>
 						<xs:choice>
 							<xs:element name="userPrincipal">
 								<xs:complexType>
 									<xs:complexContent>
 										<xs:extension base="pvpPrincipalType">
 											<xs:sequence>
-												<xs:element name="gvGid" type="xs:string" />
-												<xs:element name="gvFunction" type="xs:string"
-													minOccurs="0" />
+												<xs:element name="gvGid" type="xs:string"/>
+												<xs:element name="gvFunction" type="xs:string" minOccurs="0"/>
 											</xs:sequence>
 										</xs:extension>
 									</xs:complexContent>
 								</xs:complexType>
 							</xs:element>
-							<xs:element name="systemPrincipal" type="pvpPrincipalType" />
+							<xs:element name="systemPrincipal" type="pvpPrincipalType"/>
 						</xs:choice>
 					</xs:sequence>
 				</xs:complexType>
@@ -32,21 +29,20 @@
 			<xs:element name="authorize" minOccurs="0">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element ref="role" maxOccurs="unbounded" />
-						<xs:element name="dummy" minOccurs="0" />
+						<xs:element ref="role" maxOccurs="unbounded"/>
+						<xs:element name="dummy" minOccurs="0"/>
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
 			<xs:element name="accounting" minOccurs="0">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element name="invoiceRecptId" type="xs:string" />
+						<xs:element name="invoiceRecptId" type="xs:string"/>
 						<xs:element name="gvCostCenterId" maxOccurs="unbounded">
 							<xs:complexType>
 								<xs:simpleContent>
 									<xs:extension base="xs:string">
-										<xs:attribute name="default" type="xs:boolean"
-											use="optional" default="false" />
+										<xs:attribute name="default" type="xs:boolean" use="optional" default="false"/>
 									</xs:extension>
 								</xs:simpleContent>
 							</xs:complexType>
@@ -55,8 +51,7 @@
 							<xs:complexType>
 								<xs:simpleContent>
 									<xs:extension base="xs:string">
-										<xs:attribute name="default" type="xs:boolean"
-											use="optional" default="false" />
+										<xs:attribute name="default" type="xs:boolean" use="optional" default="false"/>
 									</xs:extension>
 								</xs:simpleContent>
 							</xs:complexType>
@@ -64,63 +59,59 @@
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
-			<xs:element name="pvpChainedToken" type="pvpTokenType"
-				minOccurs="0" />
-			<xs:element name="pvpExtension" block="extension"
-				minOccurs="0">
+			<xs:element name="pvpChainedToken" type="pvpTokenType" minOccurs="0"/>
+			<xs:element name="pvpExtension" block="extension" minOccurs="0">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:any namespace="##any" processContents="lax" maxOccurs="unbounded" />
+						<xs:any namespace="##any" processContents="lax" maxOccurs="unbounded"/>
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
 		</xs:sequence>
-		<xs:attribute name="version" type="gvVersionType" use="required" />
-		<xs:anyAttribute namespace="##any" processContents="lax" />
+		<xs:attribute name="version" type="gvVersionType" use="required"/>
+		<xs:anyAttribute namespace="##any" processContents="lax"/>
 	</xs:complexType>
 	<xs:complexType name="pvpPrincipalType">
 		<xs:sequence>
-			<xs:element name="userId" type="xs:string" />
-			<xs:element name="cn" type="xs:string" />
-			<xs:element name="gvOuId" type="xs:string" />
-			<xs:element name="ou" type="xs:string" />
-			<xs:element name="gvSecClass" type="gvSecClassType"
-				minOccurs="0" />
+			<xs:element name="userId" type="xs:string"/>
+			<xs:element name="cn" type="xs:string"/>
+			<xs:element name="gvOuId" type="xs:string"/>
+			<xs:element name="ou" type="xs:string"/>
+			<xs:element name="gvSecClass" type="gvSecClassType" minOccurs="0"/>
 		</xs:sequence>
-		<xs:anyAttribute namespace="##any" processContents="lax" />
+		<xs:anyAttribute namespace="##any" processContents="lax"/>
 	</xs:complexType>
 	<xs:simpleType name="gvSecClassType">
 		<xs:restriction base="xs:integer">
-			<xs:enumeration value="0" />
-			<xs:enumeration value="1" />
-			<xs:enumeration value="2" />
-			<xs:enumeration value="3" />
+			<xs:enumeration value="0"/>
+			<xs:enumeration value="1"/>
+			<xs:enumeration value="2"/>
+			<xs:enumeration value="3"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="gvVersionType">
 		<xs:restriction base="xs:string">
-			<xs:enumeration value="1.0" />
-			<xs:enumeration value="1.1" />
-			<xs:enumeration value="1.2" />
-			<xs:enumeration value="1.8" />
+			<xs:enumeration value="1.0"/>
+			<xs:enumeration value="1.1"/>
+			<xs:enumeration value="1.2"/>
+			<xs:enumeration value="1.8"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:element name="role">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element ref="param" maxOccurs="unbounded" />
-				<xs:element name="dummy" minOccurs="0" />
+				<xs:element ref="param" maxOccurs="unbounded"/>
+				<xs:element name="dummy" minOccurs="0"/>
 			</xs:sequence>
-			<xs:attribute name="value" type="xs:string" use="required" />
+			<xs:attribute name="value" type="xs:string" use="required"/>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="param">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="key" type="xs:string" />
-				<xs:element name="value" type="xs:string" />
+				<xs:element name="key" type="xs:string"/>
+				<xs:element name="value" type="xs:string"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 </xs:schema>
-