change more client implementations to APACHE CXF

6 files changed, 336 insertions, 359 deletions

diff --git a/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl b/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl
index fe227ae..3c40e41 100644
--- a/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl
+++ b/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl
@@ -2,116 +2,113 @@
 <!-- 
   Web Service Description for MOA SP/SS 1.4
 -->
-<definitions name="MOA"
-             targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl"
-             xmlns="http://schemas.xmlsoap.org/wsdl/"
-             xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl"
-             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-             xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#"
-             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  
-  <xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl">
-    	<xsd:import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" schemaLocation="MOA-SPSS-1.3.xsd"/>
-    </xsd:schema>
-  <message name="CreateXMLSignatureInput">
-    <part name="body" element="moa:CreateXMLSignatureRequest"/>
-  </message>
-  <message name="CreateXMLSignatureOutput">
-    <part name="body" element="moa:CreateXMLSignatureResponse"/>
-  </message>
-  <message name="VerifyCMSSignatureInput">
-    <part name="body" element="moa:VerifyCMSSignatureRequest"/>
-  </message>
-  <message name="VerifyCMSSignatureOutput">
-    <part name="body" element="moa:VerifyCMSSignatureResponse"/>
-  </message>
-  <message name="VerifyXMLSignatureInput">
-    <part name="body" element="moa:VerifyXMLSignatureRequest"/>
-  </message>
-  <message name="VerifyXMLSignatureOutput">
-    <part name="body" element="moa:VerifyXMLSignatureResponse"/>
-  </message>
-  <message name="MOAFault">
-    <part name="body" element="moa:ErrorResponse"/>
-  </message>
-  <portType name="SignatureCreationPortType">
-    <operation name="createXMLSignature">
-      <input message="tns:CreateXMLSignatureInput"/>
-      <output message="tns:CreateXMLSignatureOutput"/>
-      <fault name="MOAFault" message="tns:MOAFault"/>
-    </operation>
-  </portType>
-  <portType name="SignatureVerificationPortType">
-    <operation name="verifyCMSSignature">
-      <input message="tns:VerifyCMSSignatureInput"/>
-      <output message="tns:VerifyCMSSignatureOutput"/>
-      <fault name="MOAFault" message="tns:MOAFault"/>
-    </operation>
-    <operation name="verifyXMLSignature">
-      <input message="tns:VerifyXMLSignatureInput"/>
-      <output message="tns:VerifyXMLSignatureOutput"/>
-      <fault name="MOAFault" message="tns:MOAFault"/>
-    </operation>
-  </portType>
-  <binding name="SignatureCreationBinding" type="tns:SignatureCreationPortType">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="createXMLSignature">
-      <soap:operation soapAction="urn:CreateXMLSignatureAction"/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="MOAFault">
-        <soap:fault use="literal"/>
-      </fault>
-    </operation>
-  </binding>
-  <binding name="SignatureVerificationBinding" type="tns:SignatureVerificationPortType">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="verifyCMSSignature">
-      <soap:operation soapAction="urn:VerifyCMSSignatureAction"/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="MOAFault">
-        <soap:fault use="literal"/>
-      </fault>
-    </operation>
-    <operation name="verifyXMLSignature">
-      <soap:operation soapAction="urn:VerifyXMLSignatureAction"/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="MOAFault">
-        <soap:fault use="literal"/>
-      </fault>
-    </operation>
-  </binding>
-  <service name="SignatureCreationService">
-    <port name="SignatureCreationPort" binding="tns:SignatureCreationBinding">
-      <!--
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl">
+	<types>
+		<xsd:schema>
+			<xsd:import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" schemaLocation="MOA-SPSS-1.3.xsd"/>
+		</xsd:schema>
+	</types>
+	<message name="CreateXMLSignatureInput">
+		<part name="body" element="moa:CreateXMLSignatureRequest"/>
+	</message>
+	<message name="CreateXMLSignatureOutput">
+		<part name="body" element="moa:CreateXMLSignatureResponse"/>
+	</message>
+	<message name="VerifyCMSSignatureInput">
+		<part name="body" element="moa:VerifyCMSSignatureRequest"/>
+	</message>
+	<message name="VerifyCMSSignatureOutput">
+		<part name="body" element="moa:VerifyCMSSignatureResponse"/>
+	</message>
+	<message name="VerifyXMLSignatureInput">
+		<part name="body" element="moa:VerifyXMLSignatureRequest"/>
+	</message>
+	<message name="VerifyXMLSignatureOutput">
+		<part name="body" element="moa:VerifyXMLSignatureResponse"/>
+	</message>
+	<message name="MOAFault">
+		<part name="body" element="moa:ErrorResponse"/>
+	</message>
+	<portType name="SignatureCreationPortType">
+		<operation name="createXMLSignature">
+			<input message="tns:CreateXMLSignatureInput"/>
+			<output message="tns:CreateXMLSignatureOutput"/>
+			<fault name="MOAFault" message="tns:MOAFault"/>
+		</operation>
+	</portType>
+	<portType name="SignatureVerificationPortType">
+		<operation name="verifyCMSSignature">
+			<input message="tns:VerifyCMSSignatureInput"/>
+			<output message="tns:VerifyCMSSignatureOutput"/>
+			<fault name="MOAFault" message="tns:MOAFault"/>
+		</operation>
+		<operation name="verifyXMLSignature">
+			<input message="tns:VerifyXMLSignatureInput"/>
+			<output message="tns:VerifyXMLSignatureOutput"/>
+			<fault name="MOAFault" message="tns:MOAFault"/>
+		</operation>
+	</portType>
+	<binding name="SignatureCreationBinding" type="tns:SignatureCreationPortType">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="createXMLSignature">
+			<soap:operation soapAction="urn:CreateXMLSignatureAction"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="MOAFault">
+				<soap:fault name="" use="literal"/>
+			</fault>
+		</operation>
+	</binding>
+	<binding name="SignatureVerificationBinding" type="tns:SignatureVerificationPortType">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="verifyCMSSignature">
+			<soap:operation soapAction="urn:VerifyCMSSignatureAction"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="MOAFault">
+				<soap:fault name="" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="verifyXMLSignature">
+			<soap:operation soapAction="urn:VerifyXMLSignatureAction"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="MOAFault">
+				<soap:fault name="" use="literal"/>
+			</fault>
+		</operation>
+	</binding>
+	<service name="SignatureCreationService">
+		<port name="SignatureCreationPort" binding="tns:SignatureCreationBinding">
+			<soap:address location="http://localhost/moa-spss/services/SignatureCreation"/>
+			<!--
         Please note that the location URL must be adapted to the actual service URL.
       
       -->
-      <soap:address location="http://localhost/moa-spss/services/SignatureCreation"/>
-    </port>
-  </service>
-  <service name="SignatureVerificationService">
-    <port name="SignatureVerificationPort" binding="tns:SignatureVerificationBinding">
-      <!--
+		</port>
+	</service>
+	<service name="SignatureVerificationService">
+		<port name="SignatureVerificationPort" binding="tns:SignatureVerificationBinding">
+			<soap:address location="http://localhost/moa-spss/services/SignatureVerification"/>
+			<!--
         Please note that the location URL must be adapted to the actual service URL.
       
       -->
-      <soap:address location="http://localhost/moa-spss/services/SignatureVerification"/>
-    </port>
-  </service>
+		</port>
+	</service>
+	<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl">
+		<xsd:import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" schemaLocation="MOA-SPSS-1.3.xsd"/>
+	</xsd:schema>
 </definitions>
diff --git a/src/main/resources/wsdl/custom-bindings/szr-schemas.xml b/src/main/resources/wsdl/custom-bindings/szr-schemas.xml
index f65d13b..67afa83 100644
--- a/src/main/resources/wsdl/custom-bindings/szr-schemas.xml
+++ b/src/main/resources/wsdl/custom-bindings/szr-schemas.xml
@@ -3,6 +3,22 @@
 	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="../szr/szr_v2.0.xsd">
+		<bindings node="/xsd:schema">
+			<schemaBindings>
+				<package name="at.gv.util.xsd.szr" />
+			</schemaBindings>
+		</bindings>
+	</bindings>
+
+  <!--bindings schemaLocation="../szr/szr_v2.0.xsd">
+		<bindings node="/xs:schema/xs:element[@name="GetBPK"]">
+			<schemaBindings>
+				<package name="at.gv.util.xsd.haha" />
+			</schemaBindings>
+		</bindings>
+	</bindings-->
+  
 	<bindings schemaLocation="../szr/szr_ecdsa.xsd">
 		<bindings node="/xsd:schema">
 			<schemaBindings>
@@ -35,15 +51,7 @@
 		</bindings>
 	</bindings>
 
-	<bindings schemaLocation="../szr/szr_v2.0.xsd">
-		<bindings node="/xsd:schema">
-			<schemaBindings>
-				<package name="at.gv.util.xsd.szr" />
-			</schemaBindings>
-		</bindings>
-	</bindings>
-
-	<bindings schemaLocation="../szr/szr_xmldsig.xsd">
+  <bindings schemaLocation="../szr/szr_xmldsig.xsd">
 		<bindings node="/xsd:schema">
 			<schemaBindings>
 				<package name="at.gv.util.xsd.szr.xmldsig" />
diff --git a/src/main/resources/wsdl/custom-bindings/szr-wsdl.xml b/src/main/resources/wsdl/custom-bindings/szr-wsdl.xml
index 8f3c358..02cc04e 100644
--- a/src/main/resources/wsdl/custom-bindings/szr-wsdl.xml
+++ b/src/main/resources/wsdl/custom-bindings/szr-wsdl.xml
@@ -4,5 +4,7 @@
                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
 
-  <package name="at.gv.util.wsdl.szr"/>  
+  <enableWrapperStyle>false</enableWrapperStyle>
+  <package name="at.gv.util.wsdl.szr"/> 
+     
 </bindings>
\ No newline at end of file
diff --git a/src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl b/src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl
index 2a249f3..f037b44 100644
--- a/src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl
+++ b/src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
-			 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-             xmlns:tns="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl"
-             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-             xmlns:usp="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd"
-             name="usp"
-             targetNamespace="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl">
-
-	<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl">
-    	<xsd:import namespace="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd" schemaLocation="mis-usp-1.0.2.xsd"/>
-    </xsd:schema>
-    
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:usp="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd" name="usp" targetNamespace="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl">
+	<types>
+		<xsd:schema>
+			<xsd:import namespace="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd" schemaLocation="mis-usp-1.0.2.xsd"/>
+		</xsd:schema>
+	</types>
 	<message name="GetMandatesRequest">
 		<part name="GetMandatesRequest" element="usp:GetMandatesRequest"/>
 	</message>
@@ -38,6 +32,9 @@
 	<service name="GetMandatesService">
 		<port name="GetMandatesPort" binding="tns:GetMandatesBinding">
 			<soap:address location="http://localhost:8080/usp/GetMandatesService"/>
-		</port>		
+		</port>
 	</service>
+	<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl">
+		<xsd:import namespace="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd" schemaLocation="mis-usp-1.0.2.xsd"/>
+	</xsd:schema>
 </definitions>
diff --git a/src/main/resources/wsdl/szr/SZR_v2.0.wsdl b/src/main/resources/wsdl/szr/SZR_v2.0.wsdl
index 4819cdc..3da49dd 100644
--- a/src/main/resources/wsdl/szr/SZR_v2.0.wsdl
+++ b/src/main/resources/wsdl/szr/SZR_v2.0.wsdl
@@ -1,269 +1,267 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:szr="urn:SZRServices"

-	xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:pd="http://reference.e-government.gv.at/namespace/persondata/20020228#"

-	xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema"

-	xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:ecdsa="http://www.w3.org/2001/04/xmldsig-more#"

-	xmlns:pvp="http://egov.gv.at/pvp1.xsd" xmlns:wsse="http://schemas.xmlsoap.org/ws/2002/04/secext" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"

-	targetNamespace="urn:SZRServices">

-	

-	<import namespace="urn:SZRServices" location="szr_v2.0.xsd"/>

-	

+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:szr="urn:SZRServices" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:pd="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:ecdsa="http://www.w3.org/2001/04/xmldsig-more#" xmlns:pvp="http://egov.gv.at/pvp1.xsd" xmlns:wsse="http://schemas.xmlsoap.org/ws/2002/04/secext" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" targetNamespace="urn:SZRServices">

+		<types>

+			<xs:schema>

+				<xs:import namespace="urn:SZRServices" schemaLocation="szr_v2.0.xsd"/>

+			</xs:schema>

+		</types>

 	<message name="Header">

-		<part name="SecurityHeader" element="wsse:Security" />

+		<part name="SecurityHeader" element="wsse:Security"/>

 	</message>

 	<message name="GetIdentityLinkRequest">

-		<part name="parameters" element="szr:GetIdentityLink" />

+		<part name="parameters" element="szr:GetIdentityLink"/>

 	</message>

 	<message name="GetIdentityLinkResponse">

-		<part name="parameters" element="szr:GetIdentityLinkResponse" />

+		<part name="parameters" element="szr:GetIdentityLinkResponse"/>

 	</message>

 	<message name="GetBPKRequest">

-		<part name="parameters" element="szr:GetBPK" />

+		<part name="parameters" element="szr:GetBPK"/>

 	</message>

 	<message name="GetBPKResponse">

-		<part name="parameters" element="szr:GetBPKResponse" />

+		<part name="parameters" element="szr:GetBPKResponse"/>

 	</message>

 	<message name="GetBPKKombiRequest">

-		<part name="parameters" element="szr:GetBPKKombi" />

+		<part name="parameters" element="szr:GetBPKKombi"/>

 	</message>

 	<message name="GetBPKKombiResponse">

-		<part name="parameters" element="szr:GetBPKKombiResponse" />

+		<part name="parameters" element="szr:GetBPKKombiResponse"/>

 	</message>

 	<message name="BPKzuBasiszahlRequest">

-		<part name="parameters" element="szr:BPKzuBasiszahl" />

+		<part name="parameters" element="szr:BPKzuBasiszahl"/>

 	</message>

 	<message name="BPKzuBasiszahlResponse">

-		<part name="parameters" element="szr:BPKzuBasiszahlResponse" />

+		<part name="parameters" element="szr:BPKzuBasiszahlResponse"/>

 	</message>

 	<message name="BasiszahlZuBPKRequest">

-		<part name="parameters" element="szr:BasiszahlZuBPK" />

+		<part name="parameters" element="szr:BasiszahlZuBPK"/>

 	</message>

 	<message name="BasiszahlZuBPKResponse">

-		<part name="parameters" element="szr:BasiszahlZuBPKResponse" />

+		<part name="parameters" element="szr:BasiszahlZuBPKResponse"/>

 	</message>

 	<message name="ValidateIdentityLinkRequest">

-		<part name="parameters" element="szr:ValidateIdentityLink" />

+		<part name="parameters" element="szr:ValidateIdentityLink"/>

 	</message>

 	<message name="ValidateIdentityLinkResponse">

-		<part name="parameters" element="szr:ValidateIdentityLinkResponse" />

+		<part name="parameters" element="szr:ValidateIdentityLinkResponse"/>

 	</message>

 	<message name="TransformBPKRequest">

-		<part name="parameters" element="szr:TransformBPK" />

+		<part name="parameters" element="szr:TransformBPK"/>

 	</message>

 	<message name="TransformBPKResponse">

-		<part name="parameters" element="szr:TransformBPKResponse" />

+		<part name="parameters" element="szr:TransformBPKResponse"/>

 	</message>

 	<message name="ZMRAnwendungsIntegrationRequest">

-		<part name="parameters" element="szr:ZMRAnwendungsIntegration" />

+		<part name="parameters" element="szr:ZMRAnwendungsIntegration"/>

 	</message>

 	<message name="ZMRAnwendungsIntegrationResponse">

-		<part name="parameters" element="szr:ZMRAnwendungsIntegrationResponse" />

+		<part name="parameters" element="szr:ZMRAnwendungsIntegrationResponse"/>

 	</message>

 	<message name="GetStammzahlRequest">

-		<part name="parameters" element="szr:GetStammzahl" />

+		<part name="parameters" element="szr:GetStammzahl"/>

 	</message>

 	<message name="GetStammzahlResponse">

-		<part name="parameters" element="szr:GetStammzahlResponse" />

+		<part name="parameters" element="szr:GetStammzahlResponse"/>

 	</message>

 	<message name="GetVersionRequest">

-		<part name="parameters" element="szr:GetVersion" />

+		<part name="parameters" element="szr:GetVersion"/>

 	</message>

 	<message name="GetVersionResponse">

-		<part name="parameters" element="szr:GetVersionResponse" />

+		<part name="parameters" element="szr:GetVersionResponse"/>

 	</message>

 	<message name="SZRException">

-		<part name="fault" element="szr:SZRException" />

+		<part name="fault" element="szr:SZRException"/>

 	</message>

 	<portType name="SZR">

 		<operation name="GetIdentityLink">

-			<input name="GetIdentityLinkRequest" message="szr:GetIdentityLinkRequest" />

-			<output name="GetIdentityLinkResponse" message="szr:GetIdentityLinkResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="GetIdentityLinkRequest" message="szr:GetIdentityLinkRequest"/>

+			<output name="GetIdentityLinkResponse" message="szr:GetIdentityLinkResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="GetBPK">

-			<input name="GetBPKRequest" message="szr:GetBPKRequest" />

-			<output name="GetBPKResponse" message="szr:GetBPKResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="GetBPKRequest" message="szr:GetBPKRequest"/>

+			<output name="GetBPKResponse" message="szr:GetBPKResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="GetBPKKombi">

-			<input name="GetBPKKombiRequest" message="szr:GetBPKKombiRequest" />

-			<output name="GetBPKKombiResponse" message="szr:GetBPKKombiResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="GetBPKKombiRequest" message="szr:GetBPKKombiRequest"/>

+			<output name="GetBPKKombiResponse" message="szr:GetBPKKombiResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="ValidateIdentityLink">

-			<input name="ValidateIdentityLinkRequest" message="szr:ValidateIdentityLinkRequest" />

-			<output name="ValidateIdentityLinkResponse" message="szr:ValidateIdentityLinkResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="ValidateIdentityLinkRequest" message="szr:ValidateIdentityLinkRequest"/>

+			<output name="ValidateIdentityLinkResponse" message="szr:ValidateIdentityLinkResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="TransformBPK">

-			<input name="TransformBPKRequest" message="szr:TransformBPKRequest" />

-			<output name="TransformBPKResponse" message="szr:TransformBPKResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="TransformBPKRequest" message="szr:TransformBPKRequest"/>

+			<output name="TransformBPKResponse" message="szr:TransformBPKResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="BPKzuBasiszahl">

-			<input name="BPKzuBasiszahlRequest" message="szr:BPKzuBasiszahlRequest" />

-			<output name="BPKzuBasiszahlResponse" message="szr:BPKzuBasiszahlResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="BPKzuBasiszahlRequest" message="szr:BPKzuBasiszahlRequest"/>

+			<output name="BPKzuBasiszahlResponse" message="szr:BPKzuBasiszahlResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="BasiszahlZuBPK">

-			<input name="BasiszahlZuBPKRequest" message="szr:BasiszahlZuBPKRequest" />

-			<output name="BasiszahlZuBPKResponse" message="szr:BasiszahlZuBPKResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="BasiszahlZuBPKRequest" message="szr:BasiszahlZuBPKRequest"/>

+			<output name="BasiszahlZuBPKResponse" message="szr:BasiszahlZuBPKResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="ZMRAnwendungsIntegration">

-			<input name="ZMRAnwendungsIntegrationRequest" message="szr:ZMRAnwendungsIntegrationRequest" />

-			<output name="ZMRAnwendungsIntegrationResponse" message="szr:ZMRAnwendungsIntegrationResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="ZMRAnwendungsIntegrationRequest" message="szr:ZMRAnwendungsIntegrationRequest"/>

+			<output name="ZMRAnwendungsIntegrationResponse" message="szr:ZMRAnwendungsIntegrationResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="GetStammzahl">

-			<input name="GetStammzahlRequest" message="szr:GetStammzahlRequest" />

-			<output name="GetStammzahlResponse" message="szr:GetStammzahlResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="GetStammzahlRequest" message="szr:GetStammzahlRequest"/>

+			<output name="GetStammzahlResponse" message="szr:GetStammzahlResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="GetVersion">

-			<input name="GetVersionRequest" message="szr:GetVersionRequest" />

-			<output name="GetVersionResponse" message="szr:GetVersionResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="GetVersionRequest" message="szr:GetVersionRequest"/>

+			<output name="GetVersionResponse" message="szr:GetVersionResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 	</portType>

 	<binding name="SZRSoapBinding" type="szr:SZR">

-		<wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

+		<wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>

 		<operation name="GetIdentityLink">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="GetIdentityLinkRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="GetIdentityLinkResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="GetBPK">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="GetBPKRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="GetBPKResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="GetBPKKombi">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="GetBPKKombiRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="GetBPKKombiResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="ValidateIdentityLink">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="ValidateIdentityLinkRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="ValidateIdentityLinkResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="TransformBPK">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="TransformBPKRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="TransformBPKResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="BPKzuBasiszahl">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="BPKzuBasiszahlRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="BPKzuBasiszahlResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="BasiszahlZuBPK">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="BasiszahlZuBPKRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal"></wsdlsoap:body>

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="BasiszahlZuBPKResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="ZMRAnwendungsIntegration">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="ZMRAnwendungsIntegrationRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="ZMRAnwendungsIntegrationResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="GetStammzahl">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="GetStammzahlRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="GetStammzahlResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="GetVersion">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="GetVersionRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="GetVersionResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 	</binding>

-	<service name="SZRService">
		<port name="SZRTestumgebung" binding="szr:SZRSoapBinding">

-			<wsdlsoap:address location="https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services-T/services/SZR" />

+	<service name="SZRService">

+		<port name="SZRTestumgebung" binding="szr:SZRSoapBinding">

+			<wsdlsoap:address location="https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services-T/services/SZR"/>

 		</port>

 		<port name="SZRProduktionsumgebung" binding="szr:SZRSoapBinding">

-			<wsdlsoap:address location="https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services/services/SZR" />

+			<wsdlsoap:address location="https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services/services/SZR"/>

 		</port>

 	</service>

 </definitions>

diff --git a/src/main/resources/wsdl/szr/szr_v2.0.xsd b/src/main/resources/wsdl/szr/szr_v2.0.xsd
index f4b3907..db88c6f 100644
--- a/src/main/resources/wsdl/szr/szr_v2.0.xsd
+++ b/src/main/resources/wsdl/szr/szr_v2.0.xsd
@@ -1,91 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema elementFormDefault="qualified" targetNamespace="urn:SZRServices" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:szr="urn:SZRServices"
-			xmlns:pd="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<xs:import
-		namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" schemaLocation="szr_persondata.xsd"/>
-	<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="szr_xmldsig.xsd" />
-	<xs:element name="SZRException" type="szr:SZRException" />
-	<xs:complexType name="SZRException" />
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:szr="urn:SZRServices" xmlns:pd="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" targetNamespace="urn:SZRServices" elementFormDefault="qualified">
+	<xs:import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" schemaLocation="szr_persondata.xsd"/>
+	<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="szr_xmldsig.xsd"/>
+	<xs:element name="SZRException" type="szr:SZRException"/>
+	<xs:complexType name="SZRException"/>
 	<xs:complexType name="PersonInfoType">
 		<xs:sequence>
-			<xs:element name="Person" type="pd:PhysicalPersonType" />
-			<xs:element name="RegularDomicile" minOccurs="0"
-				type="pd:PostalAddressType" />
-			<xs:element name="AddressCodes" minOccurs="0"
-				type="szr:AddressCodesType" />
-			<xs:element name="TravelDocument" nillable="true"
-				minOccurs="0" type="szr:TravelDocumentType" />
-			<xs:element name="DateOfBirthWildcard" nillable="true"
-				minOccurs="0" type="xs:boolean" />
+			<xs:element name="Person" type="pd:PhysicalPersonType"/>
+			<xs:element name="RegularDomicile" type="pd:PostalAddressType" minOccurs="0"/>
+			<xs:element name="AddressCodes" type="szr:AddressCodesType" minOccurs="0"/>
+			<xs:element name="TravelDocument" type="szr:TravelDocumentType" nillable="true" minOccurs="0"/>
+			<xs:element name="DateOfBirthWildcard" type="xs:boolean" nillable="true" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="TravelDocumentType">
 		<xs:sequence>
-			<xs:element name="DocumentNumber" minOccurs="0" type="xs:string" />
-			<xs:element name="DocumentType" minOccurs="0" type="xs:string" />
-			<xs:element name="IssueDate" minOccurs="0" type="xs:string" />
-			<xs:element name="IssuingAuthority" minOccurs="0" type="xs:string" />
-			<xs:element name="IssuingCountry" minOccurs="0" type="xs:string" />
+			<xs:element name="DocumentNumber" type="xs:string" minOccurs="0"/>
+			<xs:element name="DocumentType" type="xs:string" minOccurs="0"/>
+			<xs:element name="IssueDate" type="xs:string" minOccurs="0"/>
+			<xs:element name="IssuingAuthority" type="xs:string" minOccurs="0"/>
+			<xs:element name="IssuingCountry" type="xs:string" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AddressCodesType">
 		<xs:sequence>
-			<xs:element name="GKZ" minOccurs="0" type="xs:string" />
-			<xs:element name="OKZ" minOccurs="0" type="xs:string" />
-			<xs:element name="SKZ" minOccurs="0" type="xs:string" />
-			<xs:element name="ADRCD" minOccurs="0" type="xs:string" />
-			<xs:element name="SUBCD" minOccurs="0" type="xs:string" />
-			<xs:element name="OBJNR" minOccurs="0" type="xs:string" />
-			<xs:element name="NTZLNR" minOccurs="0" type="xs:string" />
+			<xs:element name="GKZ" type="xs:string" minOccurs="0"/>
+			<xs:element name="OKZ" type="xs:string" minOccurs="0"/>
+			<xs:element name="SKZ" type="xs:string" minOccurs="0"/>
+			<xs:element name="ADRCD" type="xs:string" minOccurs="0"/>
+			<xs:element name="SUBCD" type="xs:string" minOccurs="0"/>
+			<xs:element name="OBJNR" type="xs:string" minOccurs="0"/>
+			<xs:element name="NTZLNR" type="xs:string" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:element name="TransformBPK">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-				<xs:element name="InputBPK" type="xs:string" />
-				<xs:element name="InputBereichsKennung" type="xs:string" />
-				<xs:element name="Begruendung" type="xs:string" />
-				<xs:element maxOccurs="unbounded" name="Target"
-					type="szr:FremdBPKRequestType" />
+				<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
+				<xs:element name="InputBPK" type="xs:string"/>
+				<xs:element name="InputBereichsKennung" type="xs:string"/>
+				<xs:element name="Begruendung" type="xs:string"/>
+				<xs:element name="Target" type="szr:FremdBPKRequestType" maxOccurs="unbounded"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="TransformBPKResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element maxOccurs="unbounded" name="TransformBPKReturn"
-					type="szr:FremdBPKType" />
+				<xs:element name="TransformBPKReturn" type="szr:FremdBPKType" maxOccurs="unbounded"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:complexType name="IdentityLinkType">
 		<xs:sequence>
-			<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-			<xs:element name="Assertion" type="xs:anyType" />
-			<xs:element name="AdditionalInfo" minOccurs="0" type="xs:string" />
+			<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
+			<xs:element name="Assertion" type="xs:anyType"/>
+			<xs:element name="AdditionalInfo" type="xs:string" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="GetBPKKombiRequestType">
 		<xs:sequence>
-			<xs:element name="PersonInfo" type="szr:PersonInfoType" />
+			<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
 			<xs:element name="InsertERnP" minOccurs="0">
 				<xs:simpleType>
 					<xs:restriction base="xs:string">
-						<xs:enumeration value="NoInsert" />
-						<xs:enumeration value="InsertOnNoMatch" />
-						<xs:enumeration value="ForceInsert" />
+						<xs:enumeration value="NoInsert"/>
+						<xs:enumeration value="InsertOnNoMatch"/>
+						<xs:enumeration value="ForceInsert"/>
 					</xs:restriction>
 				</xs:simpleType>
 			</xs:element>
-			<xs:element name="Suchwizard" type="xs:boolean" minOccurs="0" />
-			<xs:element name="VKZ" type="xs:string" />
-			<xs:element name="BehoerdenKennzeichen" minOccurs="0"
-				type="xs:string" />
-			<xs:element name="BereichsKennung" type="xs:string" />
-			<xs:element name="Target" minOccurs="0" maxOccurs="unbounded"
-				type="szr:FremdBPKRequestType" />
-			<xs:element name="Sessionid" type="xs:string" minOccurs="0" />
+			<xs:element name="Suchwizard" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="VKZ" type="xs:string"/>
+			<xs:element name="BehoerdenKennzeichen" type="xs:string" minOccurs="0"/>
+			<xs:element name="BereichsKennung" type="xs:string"/>
+			<xs:element name="Target" type="szr:FremdBPKRequestType" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Sessionid" type="xs:string" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="GetBPKKombiResponseType">
@@ -93,190 +83,175 @@
 			<xs:element name="ResultRecord" maxOccurs="unbounded">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-						<xs:element name="Register" type="xs:string" />
-						<xs:element name="bPK" type="xs:string" />
-						<xs:element name="FremdBPK" minOccurs="0" maxOccurs="unbounded"
-							type="szr:FremdBPKType" />
+						<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
+						<xs:element name="Register" type="xs:string"/>
+						<xs:element name="bPK" type="xs:string"/>
+						<xs:element name="FremdBPK" type="szr:FremdBPKType" minOccurs="0" maxOccurs="unbounded"/>
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
-			<xs:element name="InsertERnPResult" type="xs:boolean" />
-			<xs:element name="FoundWithSuchwizard" type="xs:boolean" />
-			<xs:element name="Sessionid" type="xs:string" />
+			<xs:element name="InsertERnPResult" type="xs:boolean"/>
+			<xs:element name="FoundWithSuchwizard" type="xs:boolean"/>
+			<xs:element name="Sessionid" type="xs:string"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:element name="GetIdentityLink">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-				<xs:element name="KeyValue" type="dsig:KeyValueType"
-					maxOccurs="unbounded" />
-				<xs:element name="InsertERnP" type="xs:boolean"
-					minOccurs="0" />
+				<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
+				<xs:element name="KeyValue" type="dsig:KeyValueType" maxOccurs="unbounded"/>
+				<xs:element name="InsertERnP" type="xs:boolean" minOccurs="0"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="GetIdentityLinkResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="GetIdentityLinkReturn" type="szr:IdentityLinkType" />
+				<xs:element name="GetIdentityLinkReturn" type="szr:IdentityLinkType"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="GetBPK">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-				<xs:element name="BereichsKennung" type="xs:string" />
-				<xs:element name="VKZ" type="xs:string" />
-				<xs:element name="Target" type="szr:FremdBPKRequestType"
-					minOccurs="0" maxOccurs="unbounded" />
-				<xs:element name="ListMultiplePersons" type="xs:boolean"
-					minOccurs="0" />
+				<xs:element name="PersonInfo" type="szr:PersonInfoType" minOccurs="1" maxOccurs="1"/>
+				<xs:element name="BereichsKennung" type="xs:string"/>
+				<xs:element name="VKZ" type="xs:string"/>
+				<xs:element name="Target" type="szr:FremdBPKRequestType" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element name="ListMultiplePersons" type="xs:boolean" minOccurs="0"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="GetBPKResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="GetBPKReturn" type="xs:string"
-					minOccurs="0" />
-				<xs:element name="FremdBPK" type="szr:FremdBPKType"
-					minOccurs="0" maxOccurs="unbounded" />
-				<xs:element name="PersonInfo" type="szr:PersonInfoType"
-					minOccurs="0" maxOccurs="5" />
+				<xs:element name="GetBPKReturn" type="xs:string" minOccurs="0"/>
+				<xs:element name="FremdBPK" type="szr:FremdBPKType" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element name="PersonInfo" type="szr:PersonInfoType" minOccurs="0" maxOccurs="5"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="GetBPKKombi">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="GetBPKKombiRequest" type="szr:GetBPKKombiRequestType" />
+				<xs:element name="GetBPKKombiRequest" type="szr:GetBPKKombiRequestType"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="GetBPKKombiResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="GetBPKKombiResponse" type="szr:GetBPKKombiResponseType" />
+				<xs:element name="GetBPKKombiResponse" type="szr:GetBPKKombiResponseType"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="ValidateIdentityLink">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="IdentityLink" type="szr:IdentityLinkType" />
-				<xs:element name="BereichsKennung" type="xs:string" />
+				<xs:element name="IdentityLink" type="szr:IdentityLinkType"/>
+				<xs:element name="BereichsKennung" type="xs:string"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="ValidateIdentityLinkResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="ValidateIdentityLinkReturn" type="xs:string" />
+				<xs:element name="ValidateIdentityLinkReturn" type="xs:string"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="BPKzuBasiszahl">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="Bereich" type="xs:string" />
-				<xs:element name="BPK" type="xs:string" />
-				<xs:element name="BasisZahl" maxOccurs="unbounded" type="xs:string" />
+				<xs:element name="Bereich" type="xs:string"/>
+				<xs:element name="BPK" type="xs:string"/>
+				<xs:element name="BasisZahl" type="xs:string" maxOccurs="unbounded"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="BPKzuBasiszahlResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="BPKzuBasiszahlReturn" type="xs:string" />
+				<xs:element name="BPKzuBasiszahlReturn" type="xs:string"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:complexType name="FremdBPKRequestType">
 		<xs:sequence>
-			<xs:element name="BereichsKennung" type="xs:string" />
-			<xs:element name="VKZ" type="xs:string" />
+			<xs:element name="BereichsKennung" type="xs:string"/>
+			<xs:element name="VKZ" type="xs:string"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="FremdBPKType">
 		<xs:sequence>
-			<xs:element name="BereichsKennung" type="xs:string" />
-			<xs:element name="FremdBPK" type="xs:string" />
+			<xs:element name="BereichsKennung" type="xs:string"/>
+			<xs:element name="FremdBPK" type="xs:string"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:element name="BasiszahlZuBPK">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="BasisZahl" type="xs:string" maxOccurs="unbounded" />
-				<xs:element name="Bereich" type="xs:string" />
-				<xs:element minOccurs="0" maxOccurs="unbounded" name="FremdBPKTargets"
-					type="szr:FremdBPKRequestType" />
+				<xs:element name="BasisZahl" type="xs:string" maxOccurs="unbounded"/>
+				<xs:element name="Bereich" type="xs:string"/>
+				<xs:element name="FremdBPKTargets" type="szr:FremdBPKRequestType" minOccurs="0" maxOccurs="unbounded"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:complexType name="BasiszahlZuBPKReturnType">
 		<xs:sequence>
-			<xs:element name="BPK" type="xs:string" />
-			<xs:element minOccurs="0" maxOccurs="unbounded" name="FremdBPKs"
-				type="szr:FremdBPKType" />
+			<xs:element name="BPK" type="xs:string"/>
+			<xs:element name="FremdBPKs" type="szr:FremdBPKType" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:element name="BasiszahlZuBPKResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="BasiszahlZuBPKReturn" type="szr:BasiszahlZuBPKReturnType"
-					maxOccurs="unbounded" />
+				<xs:element name="BasiszahlZuBPKReturn" type="szr:BasiszahlZuBPKReturnType" maxOccurs="unbounded"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="ZMRAnwendungsIntegration">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="Bereich" type="xs:string" />
-				<xs:element minOccurs="0" maxOccurs="unbounded" name="FremdBPKTargets"
-					type="szr:FremdBPKRequestType" />
-				<xs:element name="ZMRfremdbPK" maxOccurs="unbounded"
-					type="xs:string" />
+				<xs:element name="Bereich" type="xs:string"/>
+				<xs:element name="FremdBPKTargets" type="szr:FremdBPKRequestType" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element name="ZMRfremdbPK" type="xs:string" maxOccurs="unbounded"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:complexType name="ZMRAnwendungsIntegrationReturnType">
 		<xs:sequence>
-			<xs:element name="BPK" type="xs:string" />
-			<xs:element minOccurs="0" maxOccurs="unbounded" name="FremdBPKs"
-				type="szr:FremdBPKType" />
+			<xs:element name="BPK" type="xs:string"/>
+			<xs:element name="FremdBPKs" type="szr:FremdBPKType" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:element name="ZMRAnwendungsIntegrationResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="ZMRAnwendungsIntegrationReturn" type="szr:ZMRAnwendungsIntegrationReturnType"
-					maxOccurs="unbounded" />
+				<xs:element name="ZMRAnwendungsIntegrationReturn" type="szr:ZMRAnwendungsIntegrationReturnType" maxOccurs="unbounded"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="GetStammzahl">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="PersonInfo" type="szr:PersonInfoType" />
+				<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="GetStammzahlResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="Stammzahl" type="xs:string" />
+				<xs:element name="Stammzahl" type="xs:string"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
-	<xs:element name="GetVersion" />
+	<xs:element name="GetVersion"/>
 	<xs:element name="GetVersionResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="Version" type="xs:string" />
+				<xs:element name="Version" type="xs:string"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
-</xs:schema>
\ No newline at end of file
+</xs:schema>