Update MIS Service

  -- add AuthBlock to MIS webservice request

7 files changed, 84 insertions, 37 deletions

diff --git a/generatesources.bat b/generatesources.bat
index 6db21b3..6eade9d 100644
--- a/generatesources.bat
+++ b/generatesources.bat
@@ -18,4 +18,4 @@ REM"%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/misstork/misstork.ws
 REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/szrgw/szrgw.wsdl -b ./src/main/resources/wsdl/custom-bindings/szrgw-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/szrgw-schemas.xml -b ./src/main/resources/wsdl/custom-bindings/mis-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes -target 2.1
 REM "%JAVA_HOME%\bin\xjc.exe" -b ./src/main/resources/wsdl/custom-bindings/stork.xml -d ./wsdlsources/src ./src/main/resources/wsdl/szrgw/stork.xsd
 REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/ERsB/1.1/ErsbService.wsdl -b ./src/main/resources/wsdl/custom-bindings/ersb-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/ersb-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
-"%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/ur_V5/URSucheService.wsdl -b ./src/main/resources/wsdl/custom-bindings/ur_V5-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/ur_V5-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
+REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/ur_V5/URSucheService.wsdl -b ./src/main/resources/wsdl/custom-bindings/ur_V5-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/ur_V5-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
diff --git a/src/main/java/at/gv/util/wsdl/mis/MandateIssueService.java b/src/main/java/at/gv/util/wsdl/mis/MandateIssueService.java
index 2cc7de5..f73f8fc 100644
--- a/src/main/java/at/gv/util/wsdl/mis/MandateIssueService.java
+++ b/src/main/java/at/gv/util/wsdl/mis/MandateIssueService.java
@@ -3,8 +3,6 @@ package at.gv.util.wsdl.mis;
 
 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;
@@ -23,30 +21,46 @@ import javax.xml.ws.WebServiceFeature;
 public class MandateIssueService
     extends Service
 {
-	
+
     private final static URL MANDATEISSUESERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(at.gv.util.wsdl.mis.MandateIssueService.class.getName());
-    
+    private final static WebServiceException MANDATEISSUESERVICE_EXCEPTION;
+    private final static QName MANDATEISSUESERVICE_QNAME = new QName("http://reference.e-government.gv.at/namespace/mandates/mis/1.0/wsdl", "MandateIssueService");
+
     static {
         URL url = null;
+        WebServiceException e = null;
         try {
-            URL baseUrl;
-            baseUrl = at.gv.util.wsdl.mis.MandateIssueService.class.getResource(".");
-            url = new URL(baseUrl, "file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/mis/mis-1.0.3.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/mis/mis-1.0.3.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
+            url = new URL("file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/mis/mis-1.0.3.wsdl");
+        } catch (MalformedURLException ex) {
+            e = new WebServiceException(ex);
         }
         MANDATEISSUESERVICE_WSDL_LOCATION = url;
+        MANDATEISSUESERVICE_EXCEPTION = e;
+    }
+
+    public MandateIssueService() {
+        super(__getWsdlLocation(), MANDATEISSUESERVICE_QNAME);
     }
 
+//    public MandateIssueService(WebServiceFeature... features) {
+//        super(__getWsdlLocation(), MANDATEISSUESERVICE_QNAME, features);
+//    }
+
+    public MandateIssueService(URL wsdlLocation) {
+        super(wsdlLocation, MANDATEISSUESERVICE_QNAME);
+    }
+
+//    public MandateIssueService(URL wsdlLocation, WebServiceFeature... features) {
+//        super(wsdlLocation, MANDATEISSUESERVICE_QNAME, features);
+//    }
+
     public MandateIssueService(URL wsdlLocation, QName serviceName) {
         super(wsdlLocation, serviceName);
     }
 
-    public MandateIssueService() {
-        super(MANDATEISSUESERVICE_WSDL_LOCATION, new QName("http://reference.e-government.gv.at/namespace/mandates/mis/1.0/wsdl", "MandateIssueService"));
-    }
+//    public MandateIssueService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+//        super(wsdlLocation, serviceName, features);
+//    }
 
     /**
      * 
@@ -70,4 +84,11 @@ public class MandateIssueService
         return super.getPort(new QName("http://reference.e-government.gv.at/namespace/mandates/mis/1.0/wsdl", "MandateIssuePort"), MandateIssuePortType.class, features);
     }
 
+    private static URL __getWsdlLocation() {
+        if (MANDATEISSUESERVICE_EXCEPTION!= null) {
+            throw MANDATEISSUESERVICE_EXCEPTION;
+        }
+        return MANDATEISSUESERVICE_WSDL_LOCATION;
+    }
+
 }
diff --git a/src/main/java/at/gv/util/wsdl/ur_V5/URSucheService.java b/src/main/java/at/gv/util/wsdl/ur_V5/URSucheService.java
index 8f039c3..8e5fe73 100644
--- a/src/main/java/at/gv/util/wsdl/ur_V5/URSucheService.java
+++ b/src/main/java/at/gv/util/wsdl/ur_V5/URSucheService.java
@@ -42,25 +42,25 @@ public class URSucheService
         super(__getWsdlLocation(), URSUCHESERVICE_QNAME);
     }
 
-    public URSucheService(WebServiceFeature... features) {
-        super(__getWsdlLocation(), URSUCHESERVICE_QNAME, features);
-    }
+//    public URSucheService(WebServiceFeature... features) {
+//        super(__getWsdlLocation(), URSUCHESERVICE_QNAME, features);
+//    }
 
     public URSucheService(URL wsdlLocation) {
         super(wsdlLocation, URSUCHESERVICE_QNAME);
     }
 
-    public URSucheService(URL wsdlLocation, WebServiceFeature... features) {
-        super(wsdlLocation, URSUCHESERVICE_QNAME, features);
-    }
+//    public URSucheService(URL wsdlLocation, WebServiceFeature... features) {
+//        super(wsdlLocation, URSUCHESERVICE_QNAME, features);
+//    }
 
     public URSucheService(URL wsdlLocation, QName serviceName) {
         super(wsdlLocation, serviceName);
     }
 
-    public URSucheService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
-        super(wsdlLocation, serviceName, features);
-    }
+//    public URSucheService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+//        super(wsdlLocation, serviceName, features);
+//    }
 
     /**
      * 
diff --git a/src/main/java/at/gv/util/xsd/mis/MandateIssueRequestType.java b/src/main/java/at/gv/util/xsd/mis/MandateIssueRequestType.java
index 0c67da5..86c8e52 100644
--- a/src/main/java/at/gv/util/xsd/mis/MandateIssueRequestType.java
+++ b/src/main/java/at/gv/util/xsd/mis/MandateIssueRequestType.java
@@ -45,6 +45,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  *             </complexType>
  *           </element>
  *           <element ref="{http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd}Target" minOccurs="0"/>
+ *           <element name="authBlock" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
  *         </sequence>
  *         <element name="SessionID" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *       </choice>
@@ -64,6 +65,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
     "referenceValue",
     "filters",
     "target",
+    "authBlock",
     "sessionID"
 })
 public class MandateIssueRequestType {
@@ -84,6 +86,7 @@ public class MandateIssueRequestType {
     protected MandateIssueRequestType.Filters filters;
     @XmlElement(name = "Target")
     protected Target target;
+    protected byte[] authBlock;
     @XmlElement(name = "SessionID")
     protected String sessionID;
 
@@ -252,6 +255,28 @@ public class MandateIssueRequestType {
     }
 
     /**
+     * Gets the value of the authBlock property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    public byte[] getAuthBlock() {
+        return authBlock;
+    }
+
+    /**
+     * Sets the value of the authBlock property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setAuthBlock(byte[] value) {
+        this.authBlock = value;
+    }
+
+    /**
      * Gets the value of the sessionID property.
      * 
      * @return
diff --git a/src/main/java/at/gv/util/xsd/mis/ObjectFactory.java b/src/main/java/at/gv/util/xsd/mis/ObjectFactory.java
index 5e58d91..3cd038f 100644
--- a/src/main/java/at/gv/util/xsd/mis/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/mis/ObjectFactory.java
@@ -24,8 +24,8 @@ import javax.xml.namespace.QName;
 @XmlRegistry
 public class ObjectFactory {
 
-    private final static QName _MandateIssueRequest_QNAME = new QName("http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd", "MandateIssueRequest");
     private final static QName _MandateIssueResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd", "MandateIssueResponse");
+    private final static QName _MandateIssueRequest_QNAME = new QName("http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd", "MandateIssueRequest");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.mis
@@ -99,21 +99,21 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MandateIssueRequestType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link MandateIssueResponseType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd", name = "MandateIssueRequest")
-    public JAXBElement<MandateIssueRequestType> createMandateIssueRequest(MandateIssueRequestType value) {
-        return new JAXBElement<MandateIssueRequestType>(_MandateIssueRequest_QNAME, MandateIssueRequestType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd", name = "MandateIssueResponse")
+    public JAXBElement<MandateIssueResponseType> createMandateIssueResponse(MandateIssueResponseType value) {
+        return new JAXBElement<MandateIssueResponseType>(_MandateIssueResponse_QNAME, MandateIssueResponseType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MandateIssueResponseType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link MandateIssueRequestType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd", name = "MandateIssueResponse")
-    public JAXBElement<MandateIssueResponseType> createMandateIssueResponse(MandateIssueResponseType value) {
-        return new JAXBElement<MandateIssueResponseType>(_MandateIssueResponse_QNAME, MandateIssueResponseType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd", name = "MandateIssueRequest")
+    public JAXBElement<MandateIssueRequestType> createMandateIssueRequest(MandateIssueRequestType value) {
+        return new JAXBElement<MandateIssueRequestType>(_MandateIssueRequest_QNAME, MandateIssueRequestType.class, null, value);
     }
 
 }
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/pd/NichtNatuerlichePersonTyp.java b/src/main/java/at/gv/util/xsd/ur_V5/pd/NichtNatuerlichePersonTyp.java
index eee6885..4395af6 100644
--- a/src/main/java/at/gv/util/xsd/ur_V5/pd/NichtNatuerlichePersonTyp.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/pd/NichtNatuerlichePersonTyp.java
@@ -50,10 +50,10 @@ public class NichtNatuerlichePersonTyp
 {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "Rechtsform", namespace = "http://statistik.at/namespace/ur/stammdaten/4#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "VollerName", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Rechtsform", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "UntName", namespace = "http://statistik.at/namespace/ur/stammdaten/4#", type = JAXBElement.class, required = false)
+        @XmlElementRef(name = "Rechtsform", namespace = "http://statistik.at/namespace/ur/stammdaten/4#", type = JAXBElement.class),
+        @XmlElementRef(name = "VollerName", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class),
+        @XmlElementRef(name = "Rechtsform", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class),
+        @XmlElementRef(name = "UntName", namespace = "http://statistik.at/namespace/ur/stammdaten/4#", type = JAXBElement.class)
     })
     protected List<JAXBElement<?>> rest;
     @XmlAttribute(name = "vollzugBeginn", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
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 0369145..48ef601 100644
--- a/src/main/resources/wsdl/mis/mis-1.0.3.xsd
+++ b/src/main/resources/wsdl/mis/mis-1.0.3.xsd
@@ -30,6 +30,7 @@
 					</xs:complexType>
 				</xs:element>
 				<xs:element ref="Target" minOccurs="0" maxOccurs="1"/>
+				<xs:element name="authBlock" type="xs:base64Binary" minOccurs="0" maxOccurs="1"/>
 			</xs:sequence>
 			<xs:element name="SessionID" type="xs:string"/>
 		</xs:choice>