change more client implementations to APACHE CXF

2 files changed, 61 insertions, 63 deletions

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
+    );
 }