update MMS web-service for mandate collection

10 files changed, 324 insertions, 194 deletions

diff --git a/generatesources.bat b/generatesources.bat
index f2164ce..874d022 100644
--- a/generatesources.bat
+++ b/generatesources.bat
@@ -13,7 +13,7 @@ REM "%JAVA_HOME%\bin\xjc.exe" -b ./src/main/resources/wsdl/custom-bindings/sl-sc
 
 REM "%JAVA_HOME%\bin\xjc.exe" -b ./src/main/resources/wsdl/custom-bindings/omsp-schemas.xml -d ./wsdlsources/src ./src/main/resources/wsdl/omsp/omsp.xsd
 
-REM "%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/mms/mms-1.0.xsd -b ./src/main/resources/wsdl/custom-bindings/mms-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/mms-schemas.xml -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/mms/mms.wsdl
+"%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/mms/mms-1.1.xsd -b ./src/main/resources/wsdl/custom-bindings/mms-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/mms-schemas.xml -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/mms/mms.wsdl
 
 REM "%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/mzs/app2mzs.xsd -b ./src/main/resources/wsdl/custom-bindings/mzs-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/mzs-schemas.xml -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/mzs/app2mzs.wsdl
 
@@ -39,4 +39,4 @@ REM "%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/custom-binding
 
 REM "%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/custom-bindings/szr-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/szr-schemas.xml -b ./src/main/resources/wsdl/szr/szr_pvp.xsd -b ./src/main/resources/wsdl/szr/szr_pvp_sec.xsd -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/szr/SZR_v2.0.wsdl
 
-"%APACHE_CXF%\bin\wsdl2java.bat" -b xmlbeans -b ./src/main/resources/wsdl/custom-bindings/mis-usp_v2-wsdl.xml -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/mis/usp_v2/Synchronisation.wsdl
\ No newline at end of file
+REM "%APACHE_CXF%\bin\wsdl2java.bat" -b xmlbeans -b ./src/main/resources/wsdl/custom-bindings/mis-usp_v2-wsdl.xml -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/mis/usp_v2/Synchronisation.wsdl
\ No newline at end of file
diff --git a/src/main/java/at/gv/util/wsdl/mms/GetMandatesPortType.java b/src/main/java/at/gv/util/wsdl/mms/GetMandatesPortType.java
index 258ca09..b9c831b 100644
--- a/src/main/java/at/gv/util/wsdl/mms/GetMandatesPortType.java
+++ b/src/main/java/at/gv/util/wsdl/mms/GetMandatesPortType.java
@@ -1,4 +1,3 @@
-
 package at.gv.util.wsdl.mms;
 
 import javax.jws.WebMethod;
@@ -7,35 +6,22 @@ import javax.jws.WebResult;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
-import at.gv.util.xsd.mms.GetMandatesRequest;
-import at.gv.util.xsd.mms.GetMandatesResponse;
-import at.gv.util.xsd.mms.ObjectFactory;
-
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.6 in JDK 6
- * Generated source version: 2.1
+ * This class was generated by Apache CXF 3.1.10
+ * 2019-08-07T09:40:50.580+02:00
+ * Generated source version: 3.1.10
  * 
  */
-@WebService(name = "GetMandatesPortType", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mms/1.0/wsdl")
+@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mms/1.1/wsdl", name = "GetMandatesPortType")
+@XmlSeeAlso({at.gv.util.xsd.mms.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    ObjectFactory.class
-})
 public interface GetMandatesPortType {
 
-
-    /**
-     * 
-     * @param getMandatesRequest
-     * @return
-     *     returns at.gv.util.xsd.mms.GetMandatesResponse
-     */
     @WebMethod(operationName = "GetMandatesOperation", action = "mis:GetMandatesPortType#GetMandatesOperation")
-    @WebResult(name = "GetMandatesResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mms/1.0/xsd", partName = "GetMandatesResponse")
-    public GetMandatesResponse getMandatesOperation(
-        @WebParam(name = "GetMandatesRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mms/1.0/xsd", partName = "GetMandatesRequest")
-        GetMandatesRequest getMandatesRequest);
-
+    @WebResult(name = "GetMandatesResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mms/1.1/xsd", partName = "GetMandatesResponse")
+    public at.gv.util.xsd.mms.GetMandatesResponse getMandatesOperation(
+        @WebParam(partName = "GetMandatesRequest", name = "GetMandatesRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mms/1.1/xsd")
+        at.gv.util.xsd.mms.GetMandatesRequest getMandatesRequest
+    );
 }
diff --git a/src/main/java/at/gv/util/wsdl/mms/GetMandatesService.java b/src/main/java/at/gv/util/wsdl/mms/GetMandatesService.java
index e3736d0..a1de828 100644
--- a/src/main/java/at/gv/util/wsdl/mms/GetMandatesService.java
+++ b/src/main/java/at/gv/util/wsdl/mms/GetMandatesService.java
@@ -1,41 +1,42 @@
-
 package at.gv.util.wsdl.mms;
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.logging.Logger;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
 import javax.xml.ws.WebEndpoint;
 import javax.xml.ws.WebServiceClient;
 import javax.xml.ws.WebServiceFeature;
-
+import javax.xml.ws.Service;
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.6 in JDK 6
- * Generated source version: 2.1
+ * This class was generated by Apache CXF 3.1.10
+ * 2019-08-07T09:40:50.618+02:00
+ * Generated source version: 3.1.10
  * 
  */
-@WebServiceClient(name = "GetMandatesService", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mms/1.0/wsdl", wsdlLocation = "file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/mms/mms.wsdl")
-public class GetMandatesService
-    extends Service
-{
+@WebServiceClient(name = "GetMandatesService", 
+                  wsdlLocation = "file:./src/main/resources/wsdl/mms/mms.wsdl",
+                  targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mms/1.1/wsdl") 
+public class GetMandatesService extends Service {
 
-    private final static URL GETMANDATESSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(at.gv.util.wsdl.mms.GetMandatesService.class.getName());
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("http://reference.e-government.gv.at/namespace/mandates/mms/1.1/wsdl", "GetMandatesService");
+    public final static QName GetMandatesPort = new QName("http://reference.e-government.gv.at/namespace/mandates/mms/1.1/wsdl", "GetMandatesPort");
     static {
         URL url = null;
         try {
-            URL baseUrl;
-            baseUrl = at.gv.util.wsdl.mms.GetMandatesService.class.getResource(".");
-            url = new URL(baseUrl, "file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/mms/mms.wsdl");
+            url = new URL("file:./src/main/resources/wsdl/mms/mms.wsdl");
         } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/mms/mms.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
+            java.util.logging.Logger.getLogger(GetMandatesService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "file:./src/main/resources/wsdl/mms/mms.wsdl");
         }
-        GETMANDATESSERVICE_WSDL_LOCATION = url;
+        WSDL_LOCATION = url;
+    }
+
+    public GetMandatesService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
     }
 
     public GetMandatesService(URL wsdlLocation, QName serviceName) {
@@ -43,17 +44,32 @@ public class GetMandatesService
     }
 
     public GetMandatesService() {
-        super(GETMANDATESSERVICE_WSDL_LOCATION, new QName("http://reference.e-government.gv.at/namespace/mandates/mms/1.0/wsdl", "GetMandatesService"));
+        super(WSDL_LOCATION, SERVICE);
+    }
+    
+    public GetMandatesService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
     }
 
+    public GetMandatesService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
+    }
+
+    public GetMandatesService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
+
+
+
+
     /**
-     * 
+     *
      * @return
      *     returns GetMandatesPortType
      */
     @WebEndpoint(name = "GetMandatesPort")
     public GetMandatesPortType getGetMandatesPort() {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/mandates/mms/1.0/wsdl", "GetMandatesPort"), GetMandatesPortType.class);
+        return super.getPort(GetMandatesPort, GetMandatesPortType.class);
     }
 
     /**
@@ -65,7 +81,7 @@ public class GetMandatesService
      */
     @WebEndpoint(name = "GetMandatesPort")
     public GetMandatesPortType getGetMandatesPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/mandates/mms/1.0/wsdl", "GetMandatesPort"), GetMandatesPortType.class, features);
+        return super.getPort(GetMandatesPort, GetMandatesPortType.class, features);
     }
 
 }
diff --git a/src/main/java/at/gv/util/xsd/mms/GetMandatesRequest.java b/src/main/java/at/gv/util/xsd/mms/GetMandatesRequest.java
index 9baf069..c20ad66 100644
--- a/src/main/java/at/gv/util/xsd/mms/GetMandatesRequest.java
+++ b/src/main/java/at/gv/util/xsd/mms/GetMandatesRequest.java
@@ -5,80 +5,114 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="ssPIN" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="MandateIdentifiers" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 &lt;sequence maxOccurs="unbounded">
- *                   &lt;element name="MandateIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="bPK" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
+ *         &lt;element name="bPKType" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
+ *         &lt;element name="MandateIdentifiers" minOccurs="0"&gt;
+ *           &lt;complexType&gt;
+ *             &lt;complexContent&gt;
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *                 &lt;sequence maxOccurs="unbounded"&gt;
+ *                   &lt;element name="MandateIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
+ *                 &lt;/sequence&gt;
+ *               &lt;/restriction&gt;
+ *             &lt;/complexContent&gt;
+ *           &lt;/complexType&gt;
+ *         &lt;/element&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attribute name="transactionId" use="required" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" /&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
  * </pre>
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "ssPIN",
+    "bpk",
+    "bpkType",
     "mandateIdentifiers"
 })
 @XmlRootElement(name = "GetMandatesRequest")
 public class GetMandatesRequest {
 
-    @XmlElement(required = true)
-    protected String ssPIN;
+    @XmlElement(name = "bPK", required = true)
+    protected String bpk;
+    @XmlElement(name = "bPKType", required = true)
+    protected String bpkType;
     @XmlElement(name = "MandateIdentifiers")
     protected GetMandatesRequest.MandateIdentifiers mandateIdentifiers;
+    @XmlAttribute(name = "transactionId", required = true)
+    @XmlSchemaType(name = "anySimpleType")
+    protected String transactionId;
 
     /**
-     * Gets the value of the ssPIN property.
+     * Ruft den Wert der bpk-Eigenschaft ab.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getSsPIN() {
-        return ssPIN;
+    public String getBPK() {
+        return bpk;
     }
 
     /**
-     * Sets the value of the ssPIN property.
+     * Legt den Wert der bpk-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setSsPIN(String value) {
-        this.ssPIN = value;
+    public void setBPK(String value) {
+        this.bpk = value;
     }
 
     /**
-     * Gets the value of the mandateIdentifiers property.
+     * Ruft den Wert der bpkType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBPKType() {
+        return bpkType;
+    }
+
+    /**
+     * Legt den Wert der bpkType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBPKType(String value) {
+        this.bpkType = value;
+    }
+
+    /**
+     * Ruft den Wert der mandateIdentifiers-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -90,7 +124,7 @@ public class GetMandatesRequest {
     }
 
     /**
-     * Sets the value of the mandateIdentifiers property.
+     * Legt den Wert der mandateIdentifiers-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -101,22 +135,46 @@ public class GetMandatesRequest {
         this.mandateIdentifiers = value;
     }
 
+    /**
+     * Ruft den Wert der transactionId-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTransactionId() {
+        return transactionId;
+    }
+
+    /**
+     * Legt den Wert der transactionId-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTransactionId(String value) {
+        this.transactionId = value;
+    }
+
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence maxOccurs="unbounded">
-     *         &lt;element name="MandateIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
+     * &lt;complexType&gt;
+     *   &lt;complexContent&gt;
+     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+     *       &lt;sequence maxOccurs="unbounded"&gt;
+     *         &lt;element name="MandateIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
+     *       &lt;/sequence&gt;
+     *     &lt;/restriction&gt;
+     *   &lt;/complexContent&gt;
+     * &lt;/complexType&gt;
      * </pre>
      * 
      * 
diff --git a/src/main/java/at/gv/util/xsd/mms/GetMandatesResponse.java b/src/main/java/at/gv/util/xsd/mms/GetMandatesResponse.java
index 03a236a..d2f455d 100644
--- a/src/main/java/at/gv/util/xsd/mms/GetMandatesResponse.java
+++ b/src/main/java/at/gv/util/xsd/mms/GetMandatesResponse.java
@@ -13,92 +13,121 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;sequence>
- *           &lt;element name="ssPIN" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           &lt;element name="Mandates">
- *             &lt;complexType>
- *               &lt;complexContent>
- *                 &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   &lt;sequence maxOccurs="unbounded">
- *                     &lt;element name="Mandate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *                   &lt;/sequence>
- *                 &lt;/restriction>
- *               &lt;/complexContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/sequence>
- *         &lt;sequence>
- *           &lt;element name="ErrorResponse">
- *             &lt;complexType>
- *               &lt;complexContent>
- *                 &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   &lt;sequence>
- *                     &lt;element name="Code" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *                     &lt;element name="Info" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                   &lt;/sequence>
- *                 &lt;/restriction>
- *               &lt;/complexContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/sequence>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;choice&gt;
+ *         &lt;sequence&gt;
+ *           &lt;element name="bPK" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
+ *           &lt;element name="bPKType" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
+ *           &lt;element name="Mandates"&gt;
+ *             &lt;complexType&gt;
+ *               &lt;complexContent&gt;
+ *                 &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *                   &lt;sequence maxOccurs="unbounded"&gt;
+ *                     &lt;element name="Mandate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/&gt;
+ *                   &lt;/sequence&gt;
+ *                 &lt;/restriction&gt;
+ *               &lt;/complexContent&gt;
+ *             &lt;/complexType&gt;
+ *           &lt;/element&gt;
+ *         &lt;/sequence&gt;
+ *         &lt;sequence&gt;
+ *           &lt;element name="ErrorResponse"&gt;
+ *             &lt;complexType&gt;
+ *               &lt;complexContent&gt;
+ *                 &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *                   &lt;sequence&gt;
+ *                     &lt;element name="Code" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/&gt;
+ *                     &lt;element name="Info" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
+ *                   &lt;/sequence&gt;
+ *                 &lt;/restriction&gt;
+ *               &lt;/complexContent&gt;
+ *             &lt;/complexType&gt;
+ *           &lt;/element&gt;
+ *         &lt;/sequence&gt;
+ *       &lt;/choice&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
  * </pre>
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "ssPIN",
+    "bpk",
+    "bpkType",
     "mandates",
     "errorResponse"
 })
 @XmlRootElement(name = "GetMandatesResponse")
 public class GetMandatesResponse {
 
-    protected String ssPIN;
+    @XmlElement(name = "bPK")
+    protected String bpk;
+    @XmlElement(name = "bPKType")
+    protected String bpkType;
     @XmlElement(name = "Mandates")
     protected GetMandatesResponse.Mandates mandates;
     @XmlElement(name = "ErrorResponse")
     protected GetMandatesResponse.ErrorResponse errorResponse;
 
     /**
-     * Gets the value of the ssPIN property.
+     * Ruft den Wert der bpk-Eigenschaft ab.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getSsPIN() {
-        return ssPIN;
+    public String getBPK() {
+        return bpk;
     }
 
     /**
-     * Sets the value of the ssPIN property.
+     * Legt den Wert der bpk-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setSsPIN(String value) {
-        this.ssPIN = value;
+    public void setBPK(String value) {
+        this.bpk = value;
     }
 
     /**
-     * Gets the value of the mandates property.
+     * Ruft den Wert der bpkType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBPKType() {
+        return bpkType;
+    }
+
+    /**
+     * Legt den Wert der bpkType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBPKType(String value) {
+        this.bpkType = value;
+    }
+
+    /**
+     * Ruft den Wert der mandates-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -110,7 +139,7 @@ public class GetMandatesResponse {
     }
 
     /**
-     * Sets the value of the mandates property.
+     * Legt den Wert der mandates-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -122,7 +151,7 @@ public class GetMandatesResponse {
     }
 
     /**
-     * Gets the value of the errorResponse property.
+     * Ruft den Wert der errorResponse-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -134,7 +163,7 @@ public class GetMandatesResponse {
     }
 
     /**
-     * Sets the value of the errorResponse property.
+     * Legt den Wert der errorResponse-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -147,21 +176,21 @@ public class GetMandatesResponse {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence>
-     *         &lt;element name="Code" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
-     *         &lt;element name="Info" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
+     * &lt;complexType&gt;
+     *   &lt;complexContent&gt;
+     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+     *       &lt;sequence&gt;
+     *         &lt;element name="Code" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/&gt;
+     *         &lt;element name="Info" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
+     *       &lt;/sequence&gt;
+     *     &lt;/restriction&gt;
+     *   &lt;/complexContent&gt;
+     * &lt;/complexType&gt;
      * </pre>
      * 
      * 
@@ -180,7 +209,7 @@ public class GetMandatesResponse {
         protected String info;
 
         /**
-         * Gets the value of the code property.
+         * Ruft den Wert der code-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -192,7 +221,7 @@ public class GetMandatesResponse {
         }
 
         /**
-         * Sets the value of the code property.
+         * Legt den Wert der code-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -204,7 +233,7 @@ public class GetMandatesResponse {
         }
 
         /**
-         * Gets the value of the info property.
+         * Ruft den Wert der info-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -216,7 +245,7 @@ public class GetMandatesResponse {
         }
 
         /**
-         * Sets the value of the info property.
+         * Legt den Wert der info-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -231,20 +260,20 @@ public class GetMandatesResponse {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence maxOccurs="unbounded">
-     *         &lt;element name="Mandate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
+     * &lt;complexType&gt;
+     *   &lt;complexContent&gt;
+     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+     *       &lt;sequence maxOccurs="unbounded"&gt;
+     *         &lt;element name="Mandate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/&gt;
+     *       &lt;/sequence&gt;
+     *     &lt;/restriction&gt;
+     *   &lt;/complexContent&gt;
+     * &lt;/complexType&gt;
      * </pre>
      * 
      * 
diff --git a/src/main/java/at/gv/util/xsd/mms/ObjectFactory.java b/src/main/java/at/gv/util/xsd/mms/ObjectFactory.java
index dbb7f62..8dff83e 100644
--- a/src/main/java/at/gv/util/xsd/mms/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/mms/ObjectFactory.java
@@ -38,19 +38,19 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link GetMandatesRequest.MandateIdentifiers }
+     * Create an instance of {@link GetMandatesResponse }
      * 
      */
-    public GetMandatesRequest.MandateIdentifiers createGetMandatesRequestMandateIdentifiers() {
-        return new GetMandatesRequest.MandateIdentifiers();
+    public GetMandatesResponse createGetMandatesResponse() {
+        return new GetMandatesResponse();
     }
 
     /**
-     * Create an instance of {@link GetMandatesResponse.ErrorResponse }
+     * Create an instance of {@link GetMandatesRequest.MandateIdentifiers }
      * 
      */
-    public GetMandatesResponse.ErrorResponse createGetMandatesResponseErrorResponse() {
-        return new GetMandatesResponse.ErrorResponse();
+    public GetMandatesRequest.MandateIdentifiers createGetMandatesRequestMandateIdentifiers() {
+        return new GetMandatesRequest.MandateIdentifiers();
     }
 
     /**
@@ -62,11 +62,11 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link GetMandatesResponse }
+     * Create an instance of {@link GetMandatesResponse.ErrorResponse }
      * 
      */
-    public GetMandatesResponse createGetMandatesResponse() {
-        return new GetMandatesResponse();
+    public GetMandatesResponse.ErrorResponse createGetMandatesResponseErrorResponse() {
+        return new GetMandatesResponse.ErrorResponse();
     }
 
 }
diff --git a/src/main/java/at/gv/util/xsd/mms/package-info.java b/src/main/java/at/gv/util/xsd/mms/package-info.java
index a781218..23c95ce 100644
--- a/src/main/java/at/gv/util/xsd/mms/package-info.java
+++ b/src/main/java/at/gv/util/xsd/mms/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://reference.e-government.gv.at/namespace/mandates/mms/1.0/xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://reference.e-government.gv.at/namespace/mandates/mms/1.1/xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package at.gv.util.xsd.mms;
diff --git a/src/main/resources/wsdl/custom-bindings/mms-schemas.xml b/src/main/resources/wsdl/custom-bindings/mms-schemas.xml
index d9e72b2..3f4e01b 100644
--- a/src/main/resources/wsdl/custom-bindings/mms-schemas.xml
+++ b/src/main/resources/wsdl/custom-bindings/mms-schemas.xml
@@ -3,7 +3,7 @@
 	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="../mms/mms-1.0.xsd">
+	<bindings schemaLocation="../mms/mms-1.1.xsd">
 		<bindings node="/xsd:schema">
 			<schemaBindings>
 				<package name="at.gv.util.xsd.mms" />
diff --git a/src/main/resources/wsdl/mms/mms-1.1.xsd b/src/main/resources/wsdl/mms/mms-1.1.xsd
new file mode 100644
index 0000000..0f5e6c7
--- /dev/null
+++ b/src/main/resources/wsdl/mms/mms-1.1.xsd
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/mandates/mms/1.1/xsd" targetNamespace="http://reference.e-government.gv.at/namespace/mandates/mms/1.1/xsd" elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:element name="GetMandatesRequest">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="bPK" type="xs:string"/>
+				<xs:element name="bPKType" type="xs:string"/>
+				<xs:element name="MandateIdentifiers" minOccurs="0">
+					<xs:complexType>
+						<xs:sequence maxOccurs="unbounded">
+							<xs:element name="MandateIdentifier" type="xs:string"/>
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+			<xs:attribute name="transactionId" use="required" />
+		</xs:complexType>
+	</xs:element>
+	
+	<xs:element name="GetMandatesResponse">
+		<xs:complexType>
+			<xs:choice>
+				<xs:sequence>
+					<xs:element name="bPK" type="xs:string"/>
+					<xs:element name="bPKType" type="xs:string"/>
+					<xs:element name="Mandates">
+						<xs:complexType>
+							<xs:sequence maxOccurs="unbounded">
+								<xs:element name="Mandate" type="xs:base64Binary"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+				<xs:sequence>
+					<xs:element name="ErrorResponse">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Code" type="xs:positiveInteger"/>
+								<xs:element name="Info" type="xs:string"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:choice>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/src/main/resources/wsdl/mms/mms.wsdl b/src/main/resources/wsdl/mms/mms.wsdl
index 70dcf96..606b33b 100644
--- a/src/main/resources/wsdl/mms/mms.wsdl
+++ b/src/main/resources/wsdl/mms/mms.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/mms/1.0/wsdl"
-             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-             xmlns:mms="http://reference.e-government.gv.at/namespace/mandates/mms/1.0/xsd"
-             name="mms"
-             targetNamespace="http://reference.e-government.gv.at/namespace/mandates/mms/1.0/wsdl">
-
-	<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/mandates/mms/1.0/wsdl">
-    	<xsd:import namespace="http://reference.e-government.gv.at/namespace/mandates/mms/1.0/xsd" schemaLocation="mms-1.0.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/mms/1.1/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:mms="http://reference.e-government.gv.at/namespace/mandates/mms/1.1/xsd" name="mms" targetNamespace="http://reference.e-government.gv.at/namespace/mandates/mms/1.1/wsdl">
+	<types>
+		<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/mandates/mms/1.1/wsdl">
+			<xsd:import namespace="http://reference.e-government.gv.at/namespace/mandates/mms/1.1/xsd" schemaLocation="mms-1.1.xsd"/>
+		</xsd:schema>		
+	</types>
 	<message name="GetMandatesRequest">
 		<part name="GetMandatesRequest" element="mms:GetMandatesRequest"/>
 	</message>
@@ -38,6 +32,6 @@
 	<service name="GetMandatesService">
 		<port name="GetMandatesPort" binding="tns:GetMandatesBinding">
 			<soap:address location="http://localhost:8000/mms/GetMandates"/>
-		</port>		
+		</port>
 	</service>
 </definitions>