change more client implementations to APACHE CXF

17 files changed, 560 insertions, 754 deletions

diff --git a/src/main/java/at/gv/util/wsdl/GetAuthenticationDataService.java b/src/main/java/at/gv/util/wsdl/GetAuthenticationDataService.java
index 4fa21e7..ad635ac 100644
--- a/src/main/java/at/gv/util/wsdl/GetAuthenticationDataService.java
+++ b/src/main/java/at/gv/util/wsdl/GetAuthenticationDataService.java
@@ -1,41 +1,42 @@
-
 package at.gv.util.wsdl;
 
-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.0.1
+ * 2014-10-28T17:46:23.751+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebServiceClient(name = "GetAuthenticationDataService", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", wsdlLocation = "file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-ID-1.x.wsdl")
-public class GetAuthenticationDataService
-    extends Service
-{
+@WebServiceClient(name = "GetAuthenticationDataService", 
+                  wsdlLocation = "./src/main/resources/wsdl/MOA-ID-1.x.wsdl",
+                  targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#") 
+public class GetAuthenticationDataService extends Service {
 
-    private final static URL GETAUTHENTICATIONDATASERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(at.gv.util.wsdl.GetAuthenticationDataService.class.getName());
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "GetAuthenticationDataService");
+    public final static QName IdentificationPort = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "IdentificationPort");
     static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = at.gv.util.wsdl.GetAuthenticationDataService.class.getResource(".");
-            url = new URL(baseUrl, "file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-ID-1.x.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-ID-1.x.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        GETAUTHENTICATIONDATASERVICE_WSDL_LOCATION = url;
+        URL url = GetAuthenticationDataService.class.getResource("./src/main/resources/wsdl/MOA-ID-1.x.wsdl");
+        if (url == null) {
+            url = GetAuthenticationDataService.class.getClassLoader().getResource("./src/main/resources/wsdl/MOA-ID-1.x.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(GetAuthenticationDataService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/MOA-ID-1.x.wsdl");
+        }       
+        WSDL_LOCATION = url;
+    }
+
+    public GetAuthenticationDataService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
     }
 
     public GetAuthenticationDataService(URL wsdlLocation, QName serviceName) {
@@ -43,17 +44,38 @@ public class GetAuthenticationDataService
     }
 
     public GetAuthenticationDataService() {
-        super(GETAUTHENTICATIONDATASERVICE_WSDL_LOCATION, new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "GetAuthenticationDataService"));
+        super(WSDL_LOCATION, SERVICE);
+    }
+    
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public GetAuthenticationDataService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public GetAuthenticationDataService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
     }
 
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public GetAuthenticationDataService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
+
     /**
-     * 
+     *
      * @return
      *     returns IdentificationPortType
      */
     @WebEndpoint(name = "IdentificationPort")
     public IdentificationPortType getIdentificationPort() {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "IdentificationPort"), IdentificationPortType.class);
+        return super.getPort(IdentificationPort, IdentificationPortType.class);
     }
 
     /**
@@ -65,7 +87,7 @@ public class GetAuthenticationDataService
      */
     @WebEndpoint(name = "IdentificationPort")
     public IdentificationPortType getIdentificationPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "IdentificationPort"), IdentificationPortType.class, features);
+        return super.getPort(IdentificationPort, IdentificationPortType.class, features);
     }
 
 }
diff --git a/src/main/java/at/gv/util/wsdl/IdentificationPortType.java b/src/main/java/at/gv/util/wsdl/IdentificationPortType.java
index ff10855..1c0c755 100644
--- a/src/main/java/at/gv/util/wsdl/IdentificationPortType.java
+++ b/src/main/java/at/gv/util/wsdl/IdentificationPortType.java
@@ -1,4 +1,3 @@
-
 package at.gv.util.wsdl;
 
 import javax.jws.WebMethod;
@@ -7,41 +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.saml.protocol.RequestType;
-import at.gv.util.xsd.saml.protocol.ResponseType;
-
 
 /**
- * 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.0.1
+ * 2014-10-28T17:46:23.741+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "IdentificationPortType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
+@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "IdentificationPortType")
+@XmlSeeAlso({at.gv.util.xsd.persondata.ObjectFactory.class, at.gv.util.xsd.saml.protocol.ObjectFactory.class, at.gv.util.xsd.saml.assertion.ObjectFactory.class, at.gv.util.xsd.moaspss.ObjectFactory.class, at.gv.util.xsd.xmldsig.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    at.gv.util.xsd.saml.protocol.ObjectFactory.class,
-    at.gv.util.xsd.persondata.ObjectFactory.class,
-    at.gv.util.xsd.xmldsig.ObjectFactory.class,
-    at.gv.util.xsd.saml.assertion.ObjectFactory.class,
-    at.gv.util.xsd.moaspss.ObjectFactory.class
-})
 public interface IdentificationPortType {
 
-
-    /**
-     * 
-     * @param body
-     * @return
-     *     returns at.gv.util.xsd.saml.protocol.ResponseType
-     * @throws MOAFault
-     */
-    @WebMethod(action = "urn:GetAuthenticationDataAction")
     @WebResult(name = "Response", targetNamespace = "urn:oasis:names:tc:SAML:1.0:protocol", partName = "body")
-    public ResponseType getAuthenticationData(
-        @WebParam(name = "Request", targetNamespace = "urn:oasis:names:tc:SAML:1.0:protocol", partName = "body")
-        RequestType body)
-        throws MOAFault
-    ;
-
+    @WebMethod(action = "urn:GetAuthenticationDataAction")
+    public at.gv.util.xsd.saml.protocol.ResponseType getAuthenticationData(
+        @WebParam(partName = "body", name = "Request", targetNamespace = "urn:oasis:names:tc:SAML:1.0:protocol")
+        at.gv.util.xsd.saml.protocol.RequestType body
+    ) throws MOAFault;
 }
diff --git a/src/main/java/at/gv/util/wsdl/MOAFault.java b/src/main/java/at/gv/util/wsdl/MOAFault.java
index e631845..f279560 100644
--- a/src/main/java/at/gv/util/wsdl/MOAFault.java
+++ b/src/main/java/at/gv/util/wsdl/MOAFault.java
@@ -2,54 +2,42 @@
 package at.gv.util.wsdl;
 
 import javax.xml.ws.WebFault;
-import at.gv.util.xsd.moaspss.ErrorResponseType;
 
 
 /**
- * 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.0.1
+ * 2014-10-28T17:46:23.711+01:00
+ * Generated source version: 3.0.1
  */
+
 @WebFault(name = "ErrorResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
-public class MOAFault
-    extends Exception
-{
-
-    /**
-     * Java type that goes as soapenv:Fault detail element.
-     * 
-     */
-    private ErrorResponseType faultInfo;
-
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     */
-    public MOAFault(String message, ErrorResponseType faultInfo) {
+public class MOAFault extends Exception {
+    
+    private at.gv.util.xsd.moaspss.ErrorResponseType errorResponse;
+
+    public MOAFault() {
+        super();
+    }
+    
+    public MOAFault(String message) {
         super(message);
-        this.faultInfo = faultInfo;
     }
-
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     * @param cause
-     */
-    public MOAFault(String message, ErrorResponseType faultInfo, Throwable cause) {
+    
+    public MOAFault(String message, Throwable cause) {
         super(message, cause);
-        this.faultInfo = faultInfo;
     }
 
-    /**
-     * 
-     * @return
-     *     returns fault bean: at.gv.util.xsd.moaspss.ErrorResponseType
-     */
-    public ErrorResponseType getFaultInfo() {
-        return faultInfo;
+    public MOAFault(String message, at.gv.util.xsd.moaspss.ErrorResponseType errorResponse) {
+        super(message);
+        this.errorResponse = errorResponse;
     }
 
+    public MOAFault(String message, at.gv.util.xsd.moaspss.ErrorResponseType errorResponse, Throwable cause) {
+        super(message, cause);
+        this.errorResponse = errorResponse;
+    }
+
+    public at.gv.util.xsd.moaspss.ErrorResponseType getFaultInfo() {
+        return this.errorResponse;
+    }
 }
diff --git a/src/main/java/at/gv/util/wsdl/SignatureCreationPortType.java b/src/main/java/at/gv/util/wsdl/SignatureCreationPortType.java
index b4cd5cc..050720b 100644
--- a/src/main/java/at/gv/util/wsdl/SignatureCreationPortType.java
+++ b/src/main/java/at/gv/util/wsdl/SignatureCreationPortType.java
@@ -1,4 +1,3 @@
-
 package at.gv.util.wsdl;
 
 import javax.jws.WebMethod;
@@ -8,38 +7,21 @@ import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
 
-import at.gv.util.xsd.moaspss.CreateXMLSignatureRequest;
-import at.gv.util.xsd.moaspss.CreateXMLSignatureResponseType;
-
-
 /**
- * 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.0.1
+ * 2014-10-28T17:44:05.519+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "SignatureCreationPortType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl")
+@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", name = "SignatureCreationPortType")
+@XmlSeeAlso({at.gv.util.xsd.moaspss.ObjectFactory.class, at.gv.util.xsd.xmldsig.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    at.gv.util.xsd.xmldsig.ObjectFactory.class,
-    at.gv.util.xsd.moaspss.ObjectFactory.class
-})
 public interface SignatureCreationPortType {
 
-
-    /**
-     * 
-     * @param body
-     * @return
-     *     returns at.gv.zustellung.util.xsd.moaspss.CreateXMLSignatureResponseType
-     * @throws MOAFault
-     */
-    @WebMethod(action = "urn:CreateXMLSignatureAction")
     @WebResult(name = "CreateXMLSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
-    public CreateXMLSignatureResponseType createXMLSignature(
-        @WebParam(name = "CreateXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
-        CreateXMLSignatureRequest body)
-        throws MOAFault
-    ;
-
+    @WebMethod(action = "urn:CreateXMLSignatureAction")
+    public at.gv.util.xsd.moaspss.CreateXMLSignatureResponseType createXMLSignature(
+        @WebParam(partName = "body", name = "CreateXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
+        at.gv.util.xsd.moaspss.CreateXMLSignatureRequest body
+    ) throws MOAFault;
 }
diff --git a/src/main/java/at/gv/util/wsdl/SignatureCreationService.java b/src/main/java/at/gv/util/wsdl/SignatureCreationService.java
index e8d2777..96c4035 100644
--- a/src/main/java/at/gv/util/wsdl/SignatureCreationService.java
+++ b/src/main/java/at/gv/util/wsdl/SignatureCreationService.java
@@ -1,41 +1,42 @@
-
 package at.gv.util.wsdl;
 
-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.0.1
+ * 2014-10-28T17:44:05.539+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebServiceClient(name = "SignatureCreationService", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", wsdlLocation = "file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl")
-public class SignatureCreationService
-    extends Service
-{
+@WebServiceClient(name = "SignatureCreationService", 
+                  wsdlLocation = "./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl",
+                  targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl") 
+public class SignatureCreationService extends Service {
 
-    private final static URL SIGNATURECREATIONSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(at.gv.util.wsdl.SignatureCreationService.class.getName());
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureCreationService");
+    public final static QName SignatureCreationPort = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureCreationPort");
     static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = at.gv.util.wsdl.SignatureCreationService.class.getResource(".");
-            url = new URL(baseUrl, "file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        SIGNATURECREATIONSERVICE_WSDL_LOCATION = url;
+        URL url = SignatureCreationService.class.getResource("./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
+        if (url == null) {
+            url = SignatureCreationService.class.getClassLoader().getResource("./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(SignatureCreationService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
+        }       
+        WSDL_LOCATION = url;
+    }
+
+    public SignatureCreationService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
     }
 
     public SignatureCreationService(URL wsdlLocation, QName serviceName) {
@@ -43,17 +44,38 @@ public class SignatureCreationService
     }
 
     public SignatureCreationService() {
-        super(SIGNATURECREATIONSERVICE_WSDL_LOCATION, new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureCreationService"));
+        super(WSDL_LOCATION, SERVICE);
+    }
+    
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SignatureCreationService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SignatureCreationService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
     }
 
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SignatureCreationService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
+
     /**
-     * 
+     *
      * @return
      *     returns SignatureCreationPortType
      */
     @WebEndpoint(name = "SignatureCreationPort")
     public SignatureCreationPortType getSignatureCreationPort() {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureCreationPort"), SignatureCreationPortType.class);
+        return super.getPort(SignatureCreationPort, SignatureCreationPortType.class);
     }
 
     /**
@@ -65,7 +87,7 @@ public class SignatureCreationService
      */
     @WebEndpoint(name = "SignatureCreationPort")
     public SignatureCreationPortType getSignatureCreationPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureCreationPort"), SignatureCreationPortType.class, features);
+        return super.getPort(SignatureCreationPort, SignatureCreationPortType.class, features);
     }
 
 }
diff --git a/src/main/java/at/gv/util/wsdl/SignatureVerificationPortType.java b/src/main/java/at/gv/util/wsdl/SignatureVerificationPortType.java
index 04145aa..ce33a35 100644
--- a/src/main/java/at/gv/util/wsdl/SignatureVerificationPortType.java
+++ b/src/main/java/at/gv/util/wsdl/SignatureVerificationPortType.java
@@ -1,4 +1,3 @@
-
 package at.gv.util.wsdl;
 
 import javax.jws.WebMethod;
@@ -8,55 +7,28 @@ import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
 
-import at.gv.util.xsd.moaspss.VerifyCMSSignatureRequest;
-import at.gv.util.xsd.moaspss.VerifyCMSSignatureResponseType;
-import at.gv.util.xsd.moaspss.VerifyXMLSignatureRequestType;
-import at.gv.util.xsd.moaspss.VerifyXMLSignatureResponseType;
-
-
 /**
- * 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.0.1
+ * 2014-10-28T17:44:05.509+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "SignatureVerificationPortType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl")
+@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", name = "SignatureVerificationPortType")
+@XmlSeeAlso({at.gv.util.xsd.moaspss.ObjectFactory.class, at.gv.util.xsd.xmldsig.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    at.gv.util.xsd.xmldsig.ObjectFactory.class,
-    at.gv.util.xsd.moaspss.ObjectFactory.class
-})
 public interface SignatureVerificationPortType {
 
-
-    /**
-     * 
-     * @param body
-     * @return
-     *     returns at.gv.zustellung.util.xsd.moaspss.VerifyCMSSignatureResponseType
-     * @throws MOAFault
-     */
-    @WebMethod(action = "urn:VerifyCMSSignatureAction")
-    @WebResult(name = "VerifyCMSSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
-    public VerifyCMSSignatureResponseType verifyCMSSignature(
-        @WebParam(name = "VerifyCMSSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
-        VerifyCMSSignatureRequest body)
-        throws MOAFault
-    ;
-
-    /**
-     * 
-     * @param body
-     * @return
-     *     returns at.gv.zustellung.util.xsd.moaspss.VerifyXMLSignatureResponseType
-     * @throws MOAFault
-     */
-    @WebMethod(action = "urn:VerifyXMLSignatureAction")
     @WebResult(name = "VerifyXMLSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
-    public VerifyXMLSignatureResponseType verifyXMLSignature(
-        @WebParam(name = "VerifyXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
-        VerifyXMLSignatureRequestType body)
-        throws MOAFault
-    ;
+    @WebMethod(action = "urn:VerifyXMLSignatureAction")
+    public at.gv.util.xsd.moaspss.VerifyXMLSignatureResponseType verifyXMLSignature(
+        @WebParam(partName = "body", name = "VerifyXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
+        at.gv.util.xsd.moaspss.VerifyXMLSignatureRequestType body
+    ) throws MOAFault;
 
+    @WebResult(name = "VerifyCMSSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
+    @WebMethod(action = "urn:VerifyCMSSignatureAction")
+    public at.gv.util.xsd.moaspss.VerifyCMSSignatureResponseType verifyCMSSignature(
+        @WebParam(partName = "body", name = "VerifyCMSSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
+        at.gv.util.xsd.moaspss.VerifyCMSSignatureRequest body
+    ) throws MOAFault;
 }
diff --git a/src/main/java/at/gv/util/wsdl/SignatureVerificationService.java b/src/main/java/at/gv/util/wsdl/SignatureVerificationService.java
index 9643c35..7b58455 100644
--- a/src/main/java/at/gv/util/wsdl/SignatureVerificationService.java
+++ b/src/main/java/at/gv/util/wsdl/SignatureVerificationService.java
@@ -1,41 +1,42 @@
-
 package at.gv.util.wsdl;
 
-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.0.1
+ * 2014-10-28T17:44:05.529+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebServiceClient(name = "SignatureVerificationService", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", wsdlLocation = "file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl")
-public class SignatureVerificationService
-    extends Service
-{
+@WebServiceClient(name = "SignatureVerificationService", 
+                  wsdlLocation = "./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl",
+                  targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl") 
+public class SignatureVerificationService extends Service {
 
-    private final static URL SIGNATUREVERIFICATIONSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(at.gv.util.wsdl.SignatureVerificationService.class.getName());
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureVerificationService");
+    public final static QName SignatureVerificationPort = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureVerificationPort");
     static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = at.gv.util.wsdl.SignatureVerificationService.class.getResource(".");
-            url = new URL(baseUrl, "file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        SIGNATUREVERIFICATIONSERVICE_WSDL_LOCATION = url;
+        URL url = SignatureVerificationService.class.getResource("./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
+        if (url == null) {
+            url = SignatureVerificationService.class.getClassLoader().getResource("./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(SignatureVerificationService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
+        }       
+        WSDL_LOCATION = url;
+    }
+
+    public SignatureVerificationService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
     }
 
     public SignatureVerificationService(URL wsdlLocation, QName serviceName) {
@@ -43,17 +44,38 @@ public class SignatureVerificationService
     }
 
     public SignatureVerificationService() {
-        super(SIGNATUREVERIFICATIONSERVICE_WSDL_LOCATION, new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureVerificationService"));
+        super(WSDL_LOCATION, SERVICE);
+    }
+    
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SignatureVerificationService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SignatureVerificationService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
     }
 
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SignatureVerificationService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
+
     /**
-     * 
+     *
      * @return
      *     returns SignatureVerificationPortType
      */
     @WebEndpoint(name = "SignatureVerificationPort")
     public SignatureVerificationPortType getSignatureVerificationPort() {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureVerificationPort"), SignatureVerificationPortType.class);
+        return super.getPort(SignatureVerificationPort, SignatureVerificationPortType.class);
     }
 
     /**
@@ -65,7 +87,7 @@ public class SignatureVerificationService
      */
     @WebEndpoint(name = "SignatureVerificationPort")
     public SignatureVerificationPortType getSignatureVerificationPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureVerificationPort"), SignatureVerificationPortType.class, features);
+        return super.getPort(SignatureVerificationPort, SignatureVerificationPortType.class, features);
     }
 
 }
diff --git a/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesPortType.java b/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesPortType.java
index 22a970a..a31a546 100644
--- a/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesPortType.java
+++ b/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesPortType.java
@@ -1,4 +1,3 @@
-
 package at.gv.util.wsdl.mis.usp;
 
 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.mis.usp.GetMandatesRequest;
-import at.gv.util.xsd.mis.usp.GetMandatesResponse;
-import at.gv.util.xsd.mis.usp.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.0.1
+ * 2014-10-28T17:50:38.720+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "GetMandatesPortType", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl")
+@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl", name = "GetMandatesPortType")
+@XmlSeeAlso({at.gv.util.xsd.mis.usp.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    ObjectFactory.class
-})
 public interface GetMandatesPortType {
 
-
-    /**
-     * 
-     * @param getMandatesRequest
-     * @return
-     *     returns at.gv.util.xsd.mis.usp.GetMandatesResponse
-     */
-    @WebMethod(operationName = "GetMandatesOperation", action = "usp:GetMandatesPortType#GetMandatesOperation")
     @WebResult(name = "GetMandatesResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd", partName = "GetMandatesResponse")
-    public GetMandatesResponse getMandatesOperation(
-        @WebParam(name = "GetMandatesRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd", partName = "GetMandatesRequest")
-        GetMandatesRequest getMandatesRequest);
-
+    @WebMethod(operationName = "GetMandatesOperation", action = "usp:GetMandatesPortType#GetMandatesOperation")
+    public at.gv.util.xsd.mis.usp.GetMandatesResponse getMandatesOperation(
+        @WebParam(partName = "GetMandatesRequest", name = "GetMandatesRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd")
+        at.gv.util.xsd.mis.usp.GetMandatesRequest getMandatesRequest
+    );
 }
diff --git a/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesService.java b/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesService.java
index 778922f..7e9e012 100644
--- a/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesService.java
+++ b/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesService.java
@@ -1,41 +1,42 @@
-
 package at.gv.util.wsdl.mis.usp;
 
-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.0.1
+ * 2014-10-28T17:50:38.761+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebServiceClient(name = "GetMandatesService", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl", wsdlLocation = "file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl")
-public class GetMandatesService
-    extends Service
-{
+@WebServiceClient(name = "GetMandatesService", 
+                  wsdlLocation = "./src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl",
+                  targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl") 
+public class GetMandatesService extends Service {
 
-    private final static URL GETMANDATESSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(at.gv.util.wsdl.mis.usp.GetMandatesService.class.getName());
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl", "GetMandatesService");
+    public final static QName GetMandatesPort = new QName("http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl", "GetMandatesPort");
     static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = at.gv.util.wsdl.mis.usp.GetMandatesService.class.getResource(".");
-            url = new URL(baseUrl, "file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        GETMANDATESSERVICE_WSDL_LOCATION = url;
+        URL url = GetMandatesService.class.getResource("./src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl");
+        if (url == null) {
+            url = GetMandatesService.class.getClassLoader().getResource("./src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(GetMandatesService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl");
+        }       
+        WSDL_LOCATION = url;
+    }
+
+    public GetMandatesService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
     }
 
     public GetMandatesService(URL wsdlLocation, QName serviceName) {
@@ -43,17 +44,38 @@ public class GetMandatesService
     }
 
     public GetMandatesService() {
-        super(GETMANDATESSERVICE_WSDL_LOCATION, new QName("http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl", "GetMandatesService"));
+        super(WSDL_LOCATION, SERVICE);
+    }
+    
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public GetMandatesService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public GetMandatesService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
     }
 
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    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/mis/usp/1.0.2/wsdl", "GetMandatesPort"), GetMandatesPortType.class);
+        return super.getPort(GetMandatesPort, GetMandatesPortType.class);
     }
 
     /**
@@ -65,7 +87,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/mis/usp/1.0.2/wsdl", "GetMandatesPort"), GetMandatesPortType.class, features);
+        return super.getPort(GetMandatesPort, GetMandatesPortType.class, features);
     }
 
 }
diff --git a/src/main/java/at/gv/util/wsdl/misstork/MISSTORKService.java b/src/main/java/at/gv/util/wsdl/misstork/MISSTORKService.java
index e098ccc..e1b4052 100644
--- a/src/main/java/at/gv/util/wsdl/misstork/MISSTORKService.java
+++ b/src/main/java/at/gv/util/wsdl/misstork/MISSTORKService.java
@@ -1,63 +1,81 @@
-
 package at.gv.util.wsdl.misstork;
 
-import java.net.MalformedURLException;
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
 import javax.xml.ws.WebEndpoint;
 import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
 import javax.xml.ws.WebServiceFeature;
-
+import javax.xml.ws.Service;
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.4-b01
- * Generated source version: 2.2
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:28:32.624+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebServiceClient(name = "MISSTORKService", targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl", wsdlLocation = "file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/misstork/misstork.wsdl")
-public class MISSTORKService
-    extends Service
-{
+@WebServiceClient(name = "MISSTORKService", 
+                  wsdlLocation = "./src/main/resources/wsdl/misstork/misstork.wsdl",
+                  targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl") 
+public class MISSTORKService extends Service {
 
-    private final static URL MISSTORKSERVICE_WSDL_LOCATION;
-    private final static WebServiceException MISSTORKSERVICE_EXCEPTION;
-    private final static QName MISSTORKSERVICE_QNAME = new QName("http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl", "MISSTORKService");
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl", "MISSTORKService");
+    public final static QName MISSTORKPort = new QName("http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl", "MISSTORKPort");
     static {
-        URL url = null;
-        WebServiceException e = null;
-        try {
-            url = new URL("file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/misstork/misstork.wsdl");
-        } catch (MalformedURLException ex) {
-            e = new WebServiceException(ex);
-        }
-        MISSTORKSERVICE_WSDL_LOCATION = url;
-        MISSTORKSERVICE_EXCEPTION = e;
-    }
-
-    public MISSTORKService() {
-        super(__getWsdlLocation(), MISSTORKSERVICE_QNAME);
+        URL url = MISSTORKService.class.getResource("./src/main/resources/wsdl/misstork/misstork.wsdl");
+        if (url == null) {
+            url = MISSTORKService.class.getClassLoader().getResource("./src/main/resources/wsdl/misstork/misstork.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(MISSTORKService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/misstork/misstork.wsdl");
+        }       
+        WSDL_LOCATION = url;
     }
 
     public MISSTORKService(URL wsdlLocation) {
-        super(wsdlLocation, MISSTORKSERVICE_QNAME);
+        super(wsdlLocation, SERVICE);
     }
 
     public MISSTORKService(URL wsdlLocation, QName serviceName) {
         super(wsdlLocation, serviceName);
     }
 
+    public MISSTORKService() {
+        super(WSDL_LOCATION, SERVICE);
+    }
+    
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public MISSTORKService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public MISSTORKService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public MISSTORKService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
+
     /**
-     * 
+     *
      * @return
      *     returns MISSTORKType
      */
     @WebEndpoint(name = "MISSTORKPort")
     public MISSTORKType getMISSTORKPort() {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl", "MISSTORKPort"), MISSTORKType.class);
+        return super.getPort(MISSTORKPort, MISSTORKType.class);
     }
 
     /**
@@ -69,14 +87,7 @@ public class MISSTORKService
      */
     @WebEndpoint(name = "MISSTORKPort")
     public MISSTORKType getMISSTORKPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl", "MISSTORKPort"), MISSTORKType.class, features);
-    }
-
-    private static URL __getWsdlLocation() {
-        if (MISSTORKSERVICE_EXCEPTION!= null) {
-            throw MISSTORKSERVICE_EXCEPTION;
-        }
-        return MISSTORKSERVICE_WSDL_LOCATION;
+        return super.getPort(MISSTORKPort, MISSTORKType.class, features);
     }
 
 }
diff --git a/src/main/java/at/gv/util/wsdl/misstork/MISSTORKType.java b/src/main/java/at/gv/util/wsdl/misstork/MISSTORKType.java
index eb807e6..f5fc08f 100644
--- a/src/main/java/at/gv/util/wsdl/misstork/MISSTORKType.java
+++ b/src/main/java/at/gv/util/wsdl/misstork/MISSTORKType.java
@@ -1,4 +1,3 @@
-
 package at.gv.util.wsdl.misstork;
 
 import javax.jws.WebMethod;
@@ -7,40 +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.misstork.MisStorkRequest;
-import at.gv.util.xsd.misstork.MisStorkResponse;
-
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.4-b01
- * Generated source version: 2.2
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:28:32.614+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "MISSTORKType", targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl")
+@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl", name = "MISSTORKType")
+@XmlSeeAlso({at.gv.util.xsd.persondata.ObjectFactory.class, at.gv.util.xsd.mis.ObjectFactory.class, at.gv.util.xsd.misstork.ObjectFactory.class, at.gv.util.xsd.xmldsig.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    at.gv.util.xsd.misstork.ObjectFactory.class,
-    at.gv.util.xsd.persondata.ObjectFactory.class,
-    at.gv.util.xsd.mis.ObjectFactory.class,
-    at.gv.util.xsd.xmldsig.ObjectFactory.class
-})
 public interface MISSTORKType {
 
-
-    /**
-     * 
-     * @param misStorkRequest
-     * @return
-     *     returns at.gv.util.xsd.misstork.MisStorkResponse
-     * @throws MisStorkError
-     */
-    @WebMethod(operationName = "MISSTORKOperation", action = "ms:MISSTORKType#MISSTORKOperation")
     @WebResult(name = "MisStorkResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/xsd", partName = "MisStorkResponse")
-    public MisStorkResponse misstorkOperation(
-        @WebParam(name = "MisStorkRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/xsd", partName = "MisStorkRequest")
-        MisStorkRequest misStorkRequest)
-        throws MisStorkError
-    ;
-
+    @WebMethod(operationName = "MISSTORKOperation", action = "ms:MISSTORKType#MISSTORKOperation")
+    public at.gv.util.xsd.misstork.MisStorkResponse misstorkOperation(
+        @WebParam(partName = "MisStorkRequest", name = "MisStorkRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/xsd")
+        at.gv.util.xsd.misstork.MisStorkRequest misStorkRequest
+    ) throws MisStorkError;
 }
diff --git a/src/main/java/at/gv/util/wsdl/misstork/MisStorkError.java b/src/main/java/at/gv/util/wsdl/misstork/MisStorkError.java
index 6b3ecac..15d009d 100644
--- a/src/main/java/at/gv/util/wsdl/misstork/MisStorkError.java
+++ b/src/main/java/at/gv/util/wsdl/misstork/MisStorkError.java
@@ -5,50 +5,39 @@ import javax.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.4-b01
- * Generated source version: 2.2
- * 
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:28:32.584+01:00
+ * Generated source version: 3.0.1
  */
+
 @WebFault(name = "MisStorkError", targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/xsd")
-public class MisStorkError
-    extends Exception
-{
-
-    /**
-     * Java type that goes as soapenv:Fault detail element.
-     * 
-     */
-    private at.gv.util.xsd.misstork.MisStorkError faultInfo;
-
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     */
-    public MisStorkError(String message, at.gv.util.xsd.misstork.MisStorkError faultInfo) {
+public class MisStorkError extends Exception {
+    
+    private at.gv.util.xsd.misstork.MisStorkError misStorkError;
+
+    public MisStorkError() {
+        super();
+    }
+    
+    public MisStorkError(String message) {
         super(message);
-        this.faultInfo = faultInfo;
+    }
+    
+    public MisStorkError(String message, Throwable cause) {
+        super(message, cause);
     }
 
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     * @param cause
-     */
-    public MisStorkError(String message, at.gv.util.xsd.misstork.MisStorkError faultInfo, Throwable cause) {
+    public MisStorkError(String message, at.gv.util.xsd.misstork.MisStorkError misStorkError) {
+        super(message);
+        this.misStorkError = misStorkError;
+    }
+
+    public MisStorkError(String message, at.gv.util.xsd.misstork.MisStorkError misStorkError, Throwable cause) {
         super(message, cause);
-        this.faultInfo = faultInfo;
+        this.misStorkError = misStorkError;
     }
 
-    /**
-     * 
-     * @return
-     *     returns fault bean: at.gv.util.xsd.misstork.MisStorkError
-     */
     public at.gv.util.xsd.misstork.MisStorkError getFaultInfo() {
-        return faultInfo;
+        return this.misStorkError;
     }
-
 }
diff --git a/src/main/java/at/gv/util/wsdl/szr/SZR.java b/src/main/java/at/gv/util/wsdl/szr/SZR.java
index 381617b..e2ed77c 100644
--- a/src/main/java/at/gv/util/wsdl/szr/SZR.java
+++ b/src/main/java/at/gv/util/wsdl/szr/SZR.java
@@ -1,270 +1,90 @@
-
 package at.gv.util.wsdl.szr;
 
-import java.util.List;
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
 import javax.jws.WebResult;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Holder;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-import at.gv.util.xsd.szr.BasiszahlZuBPKReturnType;
-import at.gv.util.xsd.szr.FremdBPKRequestType;
-import at.gv.util.xsd.szr.FremdBPKType;
-import at.gv.util.xsd.szr.GetBPKKombiRequestType;
-import at.gv.util.xsd.szr.GetBPKKombiResponseType;
-import at.gv.util.xsd.szr.GetVersionResponse;
-import at.gv.util.xsd.szr.IdentityLinkType;
-import at.gv.util.xsd.szr.PersonInfoType;
-import at.gv.util.xsd.szr.ZMRAnwendungsIntegrationReturnType;
-import at.gv.util.xsd.szr.xmldsig.KeyValueType;
-
 
 /**
- * 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.0.1
+ * 2014-10-28T17:23:34.032+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "SZR", targetNamespace = "urn:SZRServices")
-@XmlSeeAlso({
-    at.gv.util.xsd.szr.persondata.ObjectFactory.class,
-    at.gv.util.xsd.szr.ObjectFactory.class,
-    at.gv.util.xsd.szr.ecdsa.ObjectFactory.class,
-    at.gv.util.xsd.szr.xmldsig.ObjectFactory.class,
-    at.gv.util.xsd.szr.pvp.sec.ObjectFactory.class,
-    at.gv.util.xsd.szr.pvp.ObjectFactory.class
-})
+@WebService(targetNamespace = "urn:SZRServices", name = "SZR")
+@XmlSeeAlso({at.gv.util.xsd.szr.xmldsig.ObjectFactory.class, at.gv.util.xsd.szr.persondata.ObjectFactory.class, at.gv.util.xsd.szr.pvp.sec.ObjectFactory.class, at.gv.util.xsd.szr.ecdsa.ObjectFactory.class, at.gv.util.xsd.szr.ObjectFactory.class, at.gv.util.xsd.szr.pvp.ObjectFactory.class})
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 public interface SZR {
 
+    @WebResult(name = "TransformBPKResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
+    @WebMethod(operationName = "TransformBPK")
+    public at.gv.util.xsd.szr.TransformBPKResponse transformBPK(
+        @WebParam(partName = "parameters", name = "TransformBPK", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.TransformBPK parameters
+    ) throws SZRException;
 
-    /**
-     * 
-     * @param insertERnP
-     * @param personInfo
-     * @param keyValue
-     * @return
-     *     returns at.gv.util.xsd.szr.IdentityLinkType
-     * @throws SZRException
-     */
+    @WebResult(name = "GetIdentityLinkResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
     @WebMethod(operationName = "GetIdentityLink")
-    @WebResult(name = "GetIdentityLinkReturn", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "GetIdentityLink", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetIdentityLink")
-    @ResponseWrapper(localName = "GetIdentityLinkResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetIdentityLinkResponse")
-    public IdentityLinkType getIdentityLink(
-        @WebParam(name = "PersonInfo", targetNamespace = "urn:SZRServices")
-        PersonInfoType personInfo,
-        @WebParam(name = "KeyValue", targetNamespace = "urn:SZRServices")
-        List<KeyValueType> keyValue,
-        @WebParam(name = "InsertERnP", targetNamespace = "urn:SZRServices")
-        Boolean insertERnP)
-        throws SZRException
-    ;
-
-    /**
-     * 
-     * @param listMultiplePersons
-     * @param target
-     * @param personInfo0
-     * @param bereichsKennung
-     * @param getBPKReturn
-     * @param fremdBPK
-     * @param vkz
-     * @param personInfo
-     * @throws SZRException
-     */
-    @WebMethod(operationName = "GetBPK")
-    @RequestWrapper(localName = "GetBPK", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetBPK")
-    @ResponseWrapper(localName = "GetBPKResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetBPKResponse")
-    public void getBPK(
-        @WebParam(name = "PersonInfo", targetNamespace = "urn:SZRServices")
-        PersonInfoType personInfo,
-        @WebParam(name = "BereichsKennung", targetNamespace = "urn:SZRServices")
-        String bereichsKennung,
-        @WebParam(name = "VKZ", targetNamespace = "urn:SZRServices")
-        String vkz,
-        @WebParam(name = "Target", targetNamespace = "urn:SZRServices")
-        List<FremdBPKRequestType> target,
-        @WebParam(name = "ListMultiplePersons", targetNamespace = "urn:SZRServices")
-        Boolean listMultiplePersons,
-        @WebParam(name = "GetBPKReturn", targetNamespace = "urn:SZRServices", mode = WebParam.Mode.OUT)
-        Holder<String> getBPKReturn,
-        @WebParam(name = "FremdBPK", targetNamespace = "urn:SZRServices", mode = WebParam.Mode.OUT)
-        Holder<List<FremdBPKType>> fremdBPK,
-        @WebParam(name = "PersonInfo", targetNamespace = "urn:SZRServices", mode = WebParam.Mode.OUT)
-        Holder<List<PersonInfoType>> personInfo0)
-        throws SZRException
-    ;
+    public at.gv.util.xsd.szr.GetIdentityLinkResponse getIdentityLink(
+        @WebParam(partName = "parameters", name = "GetIdentityLink", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.GetIdentityLink parameters
+    ) throws SZRException;
 
-    /**
-     * 
-     * @param getBPKKombiRequest
-     * @return
-     *     returns at.gv.util.xsd.szr.GetBPKKombiResponseType
-     * @throws SZRException
-     */
-    @WebMethod(operationName = "GetBPKKombi")
-    @WebResult(name = "GetBPKKombiResponse", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "GetBPKKombi", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetBPKKombi")
-    @ResponseWrapper(localName = "GetBPKKombiResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetBPKKombiResponse")
-    public GetBPKKombiResponseType getBPKKombi(
-        @WebParam(name = "GetBPKKombiRequest", targetNamespace = "urn:SZRServices")
-        GetBPKKombiRequestType getBPKKombiRequest)
-        throws SZRException
-    ;
-
-    /**
-     * 
-     * @param identityLink
-     * @param bereichsKennung
-     * @return
-     *     returns java.lang.String
-     * @throws SZRException
-     */
-    @WebMethod(operationName = "ValidateIdentityLink")
-    @WebResult(name = "ValidateIdentityLinkReturn", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "ValidateIdentityLink", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.ValidateIdentityLink")
-    @ResponseWrapper(localName = "ValidateIdentityLinkResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.ValidateIdentityLinkResponse")
-    public String validateIdentityLink(
-        @WebParam(name = "IdentityLink", targetNamespace = "urn:SZRServices")
-        IdentityLinkType identityLink,
-        @WebParam(name = "BereichsKennung", targetNamespace = "urn:SZRServices")
-        String bereichsKennung)
-        throws SZRException
-    ;
-
-    /**
-     * 
-     * @param begruendung
-     * @param inputBereichsKennung
-     * @param inputBPK
-     * @param target
-     * @param personInfo
-     * @return
-     *     returns java.util.List<at.gv.util.xsd.szr.FremdBPKType>
-     * @throws SZRException
-     */
-    @WebMethod(operationName = "TransformBPK")
-    @WebResult(name = "TransformBPKReturn", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "TransformBPK", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.TransformBPK")
-    @ResponseWrapper(localName = "TransformBPKResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.TransformBPKResponse")
-    public List<FremdBPKType> transformBPK(
-        @WebParam(name = "PersonInfo", targetNamespace = "urn:SZRServices")
-        PersonInfoType personInfo,
-        @WebParam(name = "InputBPK", targetNamespace = "urn:SZRServices")
-        String inputBPK,
-        @WebParam(name = "InputBereichsKennung", targetNamespace = "urn:SZRServices")
-        String inputBereichsKennung,
-        @WebParam(name = "Begruendung", targetNamespace = "urn:SZRServices")
-        String begruendung,
-        @WebParam(name = "Target", targetNamespace = "urn:SZRServices")
-        List<FremdBPKRequestType> target)
-        throws SZRException
-    ;
+    @WebResult(name = "ZMRAnwendungsIntegrationResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
+    @WebMethod(operationName = "ZMRAnwendungsIntegration")
+    public at.gv.util.xsd.szr.ZMRAnwendungsIntegrationResponse zmrAnwendungsIntegration(
+        @WebParam(partName = "parameters", name = "ZMRAnwendungsIntegration", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.ZMRAnwendungsIntegration parameters
+    ) throws SZRException;
 
-    /**
-     * 
-     * @param basisZahl
-     * @param bpk
-     * @param bereich
-     * @return
-     *     returns java.lang.String
-     * @throws SZRException
-     */
+    @WebResult(name = "BPKzuBasiszahlResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
     @WebMethod(operationName = "BPKzuBasiszahl")
-    @WebResult(name = "BPKzuBasiszahlReturn", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "BPKzuBasiszahl", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.BPKzuBasiszahl")
-    @ResponseWrapper(localName = "BPKzuBasiszahlResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.BPKzuBasiszahlResponse")
-    public String bpKzuBasiszahl(
-        @WebParam(name = "Bereich", targetNamespace = "urn:SZRServices")
-        String bereich,
-        @WebParam(name = "BPK", targetNamespace = "urn:SZRServices")
-        String bpk,
-        @WebParam(name = "BasisZahl", targetNamespace = "urn:SZRServices")
-        List<String> basisZahl)
-        throws SZRException
-    ;
+    public at.gv.util.xsd.szr.BPKzuBasiszahlResponse bpKzuBasiszahl(
+        @WebParam(partName = "parameters", name = "BPKzuBasiszahl", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.BPKzuBasiszahl parameters
+    ) throws SZRException;
 
-    /**
-     * 
-     * @param fremdBPKTargets
-     * @param basisZahl
-     * @param bereich
-     * @return
-     *     returns java.util.List<at.gv.util.xsd.szr.BasiszahlZuBPKReturnType>
-     * @throws SZRException
-     */
+    @WebResult(name = "BasiszahlZuBPKResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
     @WebMethod(operationName = "BasiszahlZuBPK")
-    @WebResult(name = "BasiszahlZuBPKReturn", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "BasiszahlZuBPK", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.BasiszahlZuBPK")
-    @ResponseWrapper(localName = "BasiszahlZuBPKResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.BasiszahlZuBPKResponse")
-    public List<BasiszahlZuBPKReturnType> basiszahlZuBPK(
-        @WebParam(name = "BasisZahl", targetNamespace = "urn:SZRServices")
-        List<String> basisZahl,
-        @WebParam(name = "Bereich", targetNamespace = "urn:SZRServices")
-        String bereich,
-        @WebParam(name = "FremdBPKTargets", targetNamespace = "urn:SZRServices")
-        List<FremdBPKRequestType> fremdBPKTargets)
-        throws SZRException
-    ;
+    public at.gv.util.xsd.szr.BasiszahlZuBPKResponse basiszahlZuBPK(
+        @WebParam(partName = "parameters", name = "BasiszahlZuBPK", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.BasiszahlZuBPK parameters
+    ) throws SZRException;
 
-    /**
-     * 
-     * @param zmRfremdbPK
-     * @param fremdBPKTargets
-     * @param bereich
-     * @return
-     *     returns java.util.List<at.gv.util.xsd.szr.ZMRAnwendungsIntegrationReturnType>
-     * @throws SZRException
-     */
-    @WebMethod(operationName = "ZMRAnwendungsIntegration")
-    @WebResult(name = "ZMRAnwendungsIntegrationReturn", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "ZMRAnwendungsIntegration", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.ZMRAnwendungsIntegration")
-    @ResponseWrapper(localName = "ZMRAnwendungsIntegrationResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.ZMRAnwendungsIntegrationResponse")
-    public List<ZMRAnwendungsIntegrationReturnType> zmrAnwendungsIntegration(
-        @WebParam(name = "Bereich", targetNamespace = "urn:SZRServices")
-        String bereich,
-        @WebParam(name = "FremdBPKTargets", targetNamespace = "urn:SZRServices")
-        List<FremdBPKRequestType> fremdBPKTargets,
-        @WebParam(name = "ZMRfremdbPK", targetNamespace = "urn:SZRServices")
-        List<String> zmRfremdbPK)
-        throws SZRException
-    ;
+    @WebResult(name = "GetBPKKombiResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
+    @WebMethod(operationName = "GetBPKKombi")
+    public at.gv.util.xsd.szr.GetBPKKombiResponse getBPKKombi(
+        @WebParam(partName = "parameters", name = "GetBPKKombi", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.GetBPKKombi parameters
+    ) throws SZRException;
+
+    @WebResult(name = "GetVersionResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
+    @WebMethod(operationName = "GetVersion")
+    public at.gv.util.xsd.szr.GetVersionResponse getVersion(
+        @WebParam(partName = "parameters", name = "GetVersion", targetNamespace = "urn:SZRServices")
+        java.lang.Object parameters
+    ) throws SZRException;
 
-    /**
-     * 
-     * @param personInfo
-     * @return
-     *     returns java.lang.String
-     * @throws SZRException
-     */
+    @WebResult(name = "GetStammzahlResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
     @WebMethod(operationName = "GetStammzahl")
-    @WebResult(name = "Stammzahl", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "GetStammzahl", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetStammzahl")
-    @ResponseWrapper(localName = "GetStammzahlResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetStammzahlResponse")
-    public String getStammzahl(
-        @WebParam(name = "PersonInfo", targetNamespace = "urn:SZRServices")
-        PersonInfoType personInfo)
-        throws SZRException
-    ;
+    public at.gv.util.xsd.szr.GetStammzahlResponse getStammzahl(
+        @WebParam(partName = "parameters", name = "GetStammzahl", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.GetStammzahl parameters
+    ) throws SZRException;
 
-    /**
-     * 
-     * @param parameters
-     * @return
-     *     returns at.gv.util.xsd.szr.GetVersionResponse
-     * @throws SZRException
-     */
-    @WebMethod(operationName = "GetVersion")
-    @WebResult(name = "GetVersionResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
-    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-    public GetVersionResponse getVersion(
-        @WebParam(name = "GetVersion", targetNamespace = "urn:SZRServices", partName = "parameters")
-        Object parameters)
-        throws SZRException
-    ;
+    @WebResult(name = "GetBPKResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
+    @WebMethod(operationName = "GetBPK")
+    public at.gv.util.xsd.szr.GetBPKResponse getBPK(
+        @WebParam(partName = "parameters", name = "GetBPK", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.GetBPK parameters
+    ) throws SZRException;
 
+    @WebResult(name = "ValidateIdentityLinkResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
+    @WebMethod(operationName = "ValidateIdentityLink")
+    public at.gv.util.xsd.szr.ValidateIdentityLinkResponse validateIdentityLink(
+        @WebParam(partName = "parameters", name = "ValidateIdentityLink", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.ValidateIdentityLink parameters
+    ) throws SZRException;
 }
diff --git a/src/main/java/at/gv/util/wsdl/szr/SZRException.java b/src/main/java/at/gv/util/wsdl/szr/SZRException.java
index f8bdf70..59ded4e 100644
--- a/src/main/java/at/gv/util/wsdl/szr/SZRException.java
+++ b/src/main/java/at/gv/util/wsdl/szr/SZRException.java
@@ -5,50 +5,39 @@ import javax.xml.ws.WebFault;
 
 
 /**
- * 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.0.1
+ * 2014-10-28T17:23:34.012+01:00
+ * Generated source version: 3.0.1
  */
+
 @WebFault(name = "SZRException", targetNamespace = "urn:SZRServices")
-public class SZRException
-    extends Exception
-{
-
-    /**
-     * Java type that goes as soapenv:Fault detail element.
-     * 
-     */
-    private at.gv.util.xsd.szr.SZRException faultInfo;
-
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     */
-    public SZRException(String message, at.gv.util.xsd.szr.SZRException faultInfo) {
+public class SZRException extends Exception {
+    
+    private at.gv.util.xsd.szr.SZRException szrException;
+
+    public SZRException() {
+        super();
+    }
+    
+    public SZRException(String message) {
         super(message);
-        this.faultInfo = faultInfo;
+    }
+    
+    public SZRException(String message, Throwable cause) {
+        super(message, cause);
     }
 
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     * @param cause
-     */
-    public SZRException(String message, at.gv.util.xsd.szr.SZRException faultInfo, Throwable cause) {
+    public SZRException(String message, at.gv.util.xsd.szr.SZRException szrException) {
+        super(message);
+        this.szrException = szrException;
+    }
+
+    public SZRException(String message, at.gv.util.xsd.szr.SZRException szrException, Throwable cause) {
         super(message, cause);
-        this.faultInfo = faultInfo;
+        this.szrException = szrException;
     }
 
-    /**
-     * 
-     * @return
-     *     returns fault bean: at.gv.util.xsd.szr.SZRException
-     */
     public at.gv.util.xsd.szr.SZRException getFaultInfo() {
-        return faultInfo;
+        return this.szrException;
     }
-
 }
diff --git a/src/main/java/at/gv/util/wsdl/szr/SZRService.java b/src/main/java/at/gv/util/wsdl/szr/SZRService.java
index adc728c..160e22c 100644
--- a/src/main/java/at/gv/util/wsdl/szr/SZRService.java
+++ b/src/main/java/at/gv/util/wsdl/szr/SZRService.java
@@ -1,41 +1,43 @@
-
 package at.gv.util.wsdl.szr;
 
-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.0.1
+ * 2014-10-28T17:23:34.052+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebServiceClient(name = "SZRService", targetNamespace = "urn:SZRServices", wsdlLocation = "file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/szr/SZR_v2.0.wsdl")
-public class SZRService
-    extends Service
-{
+@WebServiceClient(name = "SZRService", 
+                  wsdlLocation = "./src/main/resources/wsdl/szr/SZR_v2.0.wsdl",
+                  targetNamespace = "urn:SZRServices") 
+public class SZRService extends Service {
 
-    private final static URL SZRSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(at.gv.util.wsdl.szr.SZRService.class.getName());
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("urn:SZRServices", "SZRService");
+    public final static QName SZRTestumgebung = new QName("urn:SZRServices", "SZRTestumgebung");
+    public final static QName SZRProduktionsumgebung = new QName("urn:SZRServices", "SZRProduktionsumgebung");
     static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = at.gv.util.wsdl.szr.SZRService.class.getResource(".");
-            url = new URL(baseUrl, "file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/szr/SZR_v2.0.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/szr/SZR_v2.0.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        SZRSERVICE_WSDL_LOCATION = url;
+        URL url = SZRService.class.getResource("./src/main/resources/wsdl/szr/SZR_v2.0.wsdl");
+        if (url == null) {
+            url = SZRService.class.getClassLoader().getResource("./src/main/resources/wsdl/szr/SZR_v2.0.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(SZRService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/szr/SZR_v2.0.wsdl");
+        }       
+        WSDL_LOCATION = url;
+    }
+
+    public SZRService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
     }
 
     public SZRService(URL wsdlLocation, QName serviceName) {
@@ -43,17 +45,38 @@ public class SZRService
     }
 
     public SZRService() {
-        super(SZRSERVICE_WSDL_LOCATION, new QName("urn:SZRServices", "SZRService"));
+        super(WSDL_LOCATION, SERVICE);
+    }
+    
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SZRService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
     }
 
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SZRService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SZRService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
+
     /**
-     * 
+     *
      * @return
      *     returns SZR
      */
     @WebEndpoint(name = "SZRTestumgebung")
     public SZR getSZRTestumgebung() {
-        return super.getPort(new QName("urn:SZRServices", "SZRTestumgebung"), SZR.class);
+        return super.getPort(SZRTestumgebung, SZR.class);
     }
 
     /**
@@ -65,17 +88,16 @@ public class SZRService
      */
     @WebEndpoint(name = "SZRTestumgebung")
     public SZR getSZRTestumgebung(WebServiceFeature... features) {
-        return super.getPort(new QName("urn:SZRServices", "SZRTestumgebung"), SZR.class, features);
+        return super.getPort(SZRTestumgebung, SZR.class, features);
     }
-
     /**
-     * 
+     *
      * @return
      *     returns SZR
      */
     @WebEndpoint(name = "SZRProduktionsumgebung")
     public SZR getSZRProduktionsumgebung() {
-        return super.getPort(new QName("urn:SZRServices", "SZRProduktionsumgebung"), SZR.class);
+        return super.getPort(SZRProduktionsumgebung, SZR.class);
     }
 
     /**
@@ -87,7 +109,7 @@ public class SZRService
      */
     @WebEndpoint(name = "SZRProduktionsumgebung")
     public SZR getSZRProduktionsumgebung(WebServiceFeature... features) {
-        return super.getPort(new QName("urn:SZRServices", "SZRProduktionsumgebung"), SZR.class, features);
+        return super.getPort(SZRProduktionsumgebung, SZR.class, features);
     }
 
 }
diff --git a/src/main/java/at/gv/util/wsdl/szrgw/SZRGWService.java b/src/main/java/at/gv/util/wsdl/szrgw/SZRGWService.java
index 9562d1c..fb08d8e 100644
--- a/src/main/java/at/gv/util/wsdl/szrgw/SZRGWService.java
+++ b/src/main/java/at/gv/util/wsdl/szrgw/SZRGWService.java
@@ -1,59 +1,81 @@
-
 package at.gv.util.wsdl.szrgw;
 
-import java.net.MalformedURLException;
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
 import javax.xml.ws.WebEndpoint;
 import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
 import javax.xml.ws.WebServiceFeature;
-
+import javax.xml.ws.Service;
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.4-b01
- * Generated source version: 2.1
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:23:47.331+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebServiceClient(name = "SZRGWService", targetNamespace = "http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl", wsdlLocation = "file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/szrgw/szrgw.wsdl")
-public class SZRGWService
-    extends Service
-{
+@WebServiceClient(name = "SZRGWService", 
+                  wsdlLocation = "./src/main/resources/wsdl/szrgw/szrgw.wsdl",
+                  targetNamespace = "http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl") 
+public class SZRGWService extends Service {
 
-    private final static URL SZRGWSERVICE_WSDL_LOCATION;
-    private final static WebServiceException SZRGWSERVICE_EXCEPTION;
-    private final static QName SZRGWSERVICE_QNAME = new QName("http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl", "SZRGWService");
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl", "SZRGWService");
+    public final static QName SZRGWPort = new QName("http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl", "SZRGWPort");
     static {
-        URL url = null;
-        WebServiceException e = null;
-        try {
-            url = new URL("file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/szrgw/szrgw.wsdl");
-        } catch (MalformedURLException ex) {
-            e = new WebServiceException(ex);
-        }
-        SZRGWSERVICE_WSDL_LOCATION = url;
-        SZRGWSERVICE_EXCEPTION = e;
+        URL url = SZRGWService.class.getResource("./src/main/resources/wsdl/szrgw/szrgw.wsdl");
+        if (url == null) {
+            url = SZRGWService.class.getClassLoader().getResource("./src/main/resources/wsdl/szrgw/szrgw.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(SZRGWService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/szrgw/szrgw.wsdl");
+        }       
+        WSDL_LOCATION = url;
     }
 
-    public SZRGWService() {
-        super(__getWsdlLocation(), SZRGWSERVICE_QNAME);
+    public SZRGWService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
     }
 
     public SZRGWService(URL wsdlLocation, QName serviceName) {
         super(wsdlLocation, serviceName);
     }
 
+    public SZRGWService() {
+        super(WSDL_LOCATION, SERVICE);
+    }
+    
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SZRGWService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SZRGWService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SZRGWService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
+
     /**
-     * 
+     *
      * @return
      *     returns SZRGWType
      */
     @WebEndpoint(name = "SZRGWPort")
     public SZRGWType getSZRGWPort() {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl", "SZRGWPort"), SZRGWType.class);
+        return super.getPort(SZRGWPort, SZRGWType.class);
     }
 
     /**
@@ -65,14 +87,7 @@ public class SZRGWService
      */
     @WebEndpoint(name = "SZRGWPort")
     public SZRGWType getSZRGWPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl", "SZRGWPort"), SZRGWType.class, features);
-    }
-
-    private static URL __getWsdlLocation() {
-        if (SZRGWSERVICE_EXCEPTION!= null) {
-            throw SZRGWSERVICE_EXCEPTION;
-        }
-        return SZRGWSERVICE_WSDL_LOCATION;
+        return super.getPort(SZRGWPort, SZRGWType.class, features);
     }
 
 }
diff --git a/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java b/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java
index 9f0a8bd..88c2505 100644
--- a/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java
+++ b/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java
@@ -1,4 +1,3 @@
-
 package at.gv.util.wsdl.szrgw;
 
 import javax.jws.WebMethod;
@@ -7,38 +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.srzgw.CreateIdentityLinkRequest;
-import at.gv.util.xsd.srzgw.CreateIdentityLinkResponse;
-
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.4-b01
- * Generated source version: 2.1
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:23:47.301+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "SZRGWType", targetNamespace = "http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl")
+@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl", name = "SZRGWType")
+@XmlSeeAlso({at.gv.util.xsd.persondata.ObjectFactory.class, at.gv.util.xsd.saml.assertion.ObjectFactory.class, at.gv.util.xsd.mis.ObjectFactory.class, at.gv.util.xsd.xmldsig.ObjectFactory.class, at.gv.util.xsd.srzgw.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    at.gv.util.xsd.srzgw.ObjectFactory.class,
-    at.gv.util.xsd.persondata.ObjectFactory.class,
-    at.gv.util.xsd.mis.ObjectFactory.class,
-    at.gv.util.xsd.saml.assertion.ObjectFactory.class,
-    at.gv.util.xsd.xmldsig.ObjectFactory.class
-})
 public interface SZRGWType {
 
-
-    /**
-     * 
-     * @param createIdentityLinkRequest
-     * @return
-     *     returns at.gv.util.xsd.srzgw.CreateIdentityLinkResponse
-     */
-    @WebMethod(operationName = "SZRGWOperation", action = "szrgw:SZRGWType#SZRGWOperation")
     @WebResult(name = "CreateIdentityLinkResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/szrgw/20070807/xsd", partName = "CreateIdentityLinkResponse")
-    public CreateIdentityLinkResponse szrgwOperation(
-        @WebParam(name = "CreateIdentityLinkRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/szrgw/20070807/xsd", partName = "CreateIdentityLinkRequest")
-        CreateIdentityLinkRequest createIdentityLinkRequest);
-
+    @WebMethod(operationName = "SZRGWOperation", action = "szrgw:SZRGWType#SZRGWOperation")
+    public at.gv.util.xsd.srzgw.CreateIdentityLinkResponse szrgwOperation(
+        @WebParam(partName = "CreateIdentityLinkRequest", name = "CreateIdentityLinkRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/szrgw/20070807/xsd")
+        at.gv.util.xsd.srzgw.CreateIdentityLinkRequest createIdentityLinkRequest
+    );
 }