change webservice implementation to Apache CXF

2 files changed, 59 insertions, 68 deletions

diff --git a/src/main/java/at/gv/util/wsdl/ersb/ErsbService.java b/src/main/java/at/gv/util/wsdl/ersb/ErsbService.java
index 6c0dddd..2783fad 100644
--- a/src/main/java/at/gv/util/wsdl/ersb/ErsbService.java
+++ b/src/main/java/at/gv/util/wsdl/ersb/ErsbService.java
@@ -1,4 +1,3 @@
-
 package at.gv.util.wsdl.ersb;
 
 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.ersb.ErsbRequest;
-import at.gv.util.xsd.ersb.ErsbResponse;
-
 
 /**
- * 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-16T11:55:31.380+02:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "ErsbService", targetNamespace = "http://statistik.at/namespace/ersb/1#")
+@WebService(targetNamespace = "http://statistik.at/namespace/ersb/1#", name = "ErsbService")
+@XmlSeeAlso({at.gv.util.xsd.ersb.pd.ObjectFactory.class, at.gv.util.xsd.ersb.personendata1.ObjectFactory.class, at.gv.util.xsd.ersb.basicTypes.ObjectFactory.class, at.gv.util.xsd.ersb.ObjectFactory.class, at.gv.util.xsd.ersb.simpletypes.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    at.gv.util.xsd.ersb.personendata1.ObjectFactory.class,
-    at.gv.util.xsd.ersb.pd.ObjectFactory.class,
-    at.gv.util.xsd.ersb.ObjectFactory.class,
-    at.gv.util.xsd.ersb.basicTypes.ObjectFactory.class,
-    at.gv.util.xsd.ersb.simpletypes.ObjectFactory.class
-})
 public interface ErsbService {
 
-
-    /**
-     * 
-     * @param ersbRequest
-     * @return
-     *     returns at.gv.util.xsd.ersb.ErsbResponse
-     */
-    @WebMethod(operationName = "Ersb")
     @WebResult(name = "ErsbResponse", targetNamespace = "http://statistik.at/namespace/ersb/1#", partName = "ErsbResponse")
-    public ErsbResponse ersb(
-        @WebParam(name = "ErsbRequest", targetNamespace = "http://statistik.at/namespace/ersb/1#", partName = "ErsbRequest")
-        ErsbRequest ersbRequest);
-
+    @WebMethod(operationName = "Ersb")
+    public at.gv.util.xsd.ersb.ErsbResponse ersb(
+        @WebParam(partName = "ErsbRequest", name = "ErsbRequest", targetNamespace = "http://statistik.at/namespace/ersb/1#")
+        at.gv.util.xsd.ersb.ErsbRequest ersbRequest
+    );
 }
diff --git a/src/main/java/at/gv/util/wsdl/ersb/ErsbServiceService.java b/src/main/java/at/gv/util/wsdl/ersb/ErsbServiceService.java
index 36e4694..6c96482 100644
--- a/src/main/java/at/gv/util/wsdl/ersb/ErsbServiceService.java
+++ b/src/main/java/at/gv/util/wsdl/ersb/ErsbServiceService.java
@@ -1,66 +1,81 @@
-
 package at.gv.util.wsdl.ersb;
 
-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-16T11:55:31.427+02:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebServiceClient(name = "ErsbServiceService", targetNamespace = "http://statistik.at/namespace/ersb/1#", wsdlLocation = "file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/ERsB/1.1/ErsbService.wsdl")
-public class ErsbServiceService
-    extends Service
-{
+@WebServiceClient(name = "ErsbServiceService", 
+                  wsdlLocation = "./src/main/resources/wsdl/ERsB/1.1/ErsbService.wsdl",
+                  targetNamespace = "http://statistik.at/namespace/ersb/1#") 
+public class ErsbServiceService extends Service {
 
-    private final static URL ERSBSERVICESERVICE_WSDL_LOCATION;
-    private final static WebServiceException ERSBSERVICESERVICE_EXCEPTION;
-    private final static QName ERSBSERVICESERVICE_QNAME = new QName("http://statistik.at/namespace/ersb/1#", "ErsbServiceService");
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("http://statistik.at/namespace/ersb/1#", "ErsbServiceService");
+    public final static QName ErsbServiceSoap11 = new QName("http://statistik.at/namespace/ersb/1#", "ErsbServiceSoap11");
     static {
-        URL url = null;
-        WebServiceException e = null;
-        try {
-            url = new URL("file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/ERsB/1.1/ErsbService.wsdl");
-        } catch (MalformedURLException ex) {
-            e = new WebServiceException(ex);
-        }
-        ERSBSERVICESERVICE_WSDL_LOCATION = url;
-        ERSBSERVICESERVICE_EXCEPTION = e;
+        URL url = ErsbServiceService.class.getResource("./src/main/resources/wsdl/ERsB/1.1/ErsbService.wsdl");
+        if (url == null) {
+            url = ErsbServiceService.class.getClassLoader().getResource("./src/main/resources/wsdl/ERsB/1.1/ErsbService.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(ErsbServiceService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/ERsB/1.1/ErsbService.wsdl");
+        }       
+        WSDL_LOCATION = url;
     }
 
-    public ErsbServiceService() {
-        super(__getWsdlLocation(), ERSBSERVICESERVICE_QNAME);
-    }
-
-
     public ErsbServiceService(URL wsdlLocation) {
-        super(wsdlLocation, ERSBSERVICESERVICE_QNAME);
+        super(wsdlLocation, SERVICE);
     }
 
-
     public ErsbServiceService(URL wsdlLocation, QName serviceName) {
         super(wsdlLocation, serviceName);
     }
 
+    public ErsbServiceService() {
+        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 ErsbServiceService(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 ErsbServiceService(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 ErsbServiceService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
 
     /**
-     * 
+     *
      * @return
      *     returns ErsbService
      */
     @WebEndpoint(name = "ErsbServiceSoap11")
     public ErsbService getErsbServiceSoap11() {
-        return super.getPort(new QName("http://statistik.at/namespace/ersb/1#", "ErsbServiceSoap11"), ErsbService.class);
+        return super.getPort(ErsbServiceSoap11, ErsbService.class);
     }
 
     /**
@@ -72,14 +87,7 @@ public class ErsbServiceService
      */
     @WebEndpoint(name = "ErsbServiceSoap11")
     public ErsbService getErsbServiceSoap11(WebServiceFeature... features) {
-        return super.getPort(new QName("http://statistik.at/namespace/ersb/1#", "ErsbServiceSoap11"), ErsbService.class, features);
-    }
-
-    private static URL __getWsdlLocation() {
-        if (ERSBSERVICESERVICE_EXCEPTION!= null) {
-            throw ERSBSERVICESERVICE_EXCEPTION;
-        }
-        return ERSBSERVICESERVICE_WSDL_LOCATION;
+        return super.getPort(ErsbServiceSoap11, ErsbService.class, features);
     }
 
 }