change webservice implementation to Apache CXF

4 files changed, 96 insertions, 139 deletions

diff --git a/src/main/java/at/gv/util/wsdl/ur_V5/URSuche.java b/src/main/java/at/gv/util/wsdl/ur_V5/URSuche.java
index 1d0e99d..a8dc124 100644
--- a/src/main/java/at/gv/util/wsdl/ur_V5/URSuche.java
+++ b/src/main/java/at/gv/util/wsdl/ur_V5/URSuche.java
@@ -1,4 +1,3 @@
-
 package at.gv.util.wsdl.ur_V5;
 
 import javax.jws.WebMethod;
@@ -7,62 +6,39 @@ import javax.jws.WebResult;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
-import at.gv.util.xsd.ur_V5.xmlsw.SearchByExampleType;
-import at.gv.util.xsd.ur_V5.xmlsw.SearchByIdType;
-import at.gv.util.xsd.ur_V5.xmlsw.SearchResponseType;
-
 
 /**
- * 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-16T12:00:10.771+02:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "URSuche", targetNamespace = "urn:at:statistik:ur:ws")
+@WebService(targetNamespace = "urn:at:statistik:ur:ws", name = "URSuche")
+@XmlSeeAlso({at.gv.util.xsd.ur_V5.pd.ObjectFactory.class, at.gv.util.xsd.ur_V5.simpletypes.ObjectFactory.class, at.gv.util.xsd.ur_V5.search.ObjectFactory.class, at.gv.util.xsd.ur_V5.xmlsw.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    at.gv.util.xsd.ur_V5.pd.ObjectFactory.class,
-    at.gv.util.xsd.ur_V5.search.ObjectFactory.class,
-    at.gv.util.xsd.ur_V5.xmlsw.ObjectFactory.class,
-    at.gv.util.xsd.ur_V5.simpletypes.ObjectFactory.class
-})
 public interface URSuche {
 
-
     /**
-     *  Operation für den Abfragetyp
-     *         Search by Example
-     *       
-     * 
-     * @param body
-     * @return
-     *     returns at.gv.util.xsd.ur_V5.xmlsw.SearchResponseType
-     * @throws XmlSwFault
+     * Operation für den Abfragetyp
+     *        Search by Example
+     *      
      */
-    @WebMethod
     @WebResult(name = "SearchResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", partName = "body")
-    public SearchResponseType searchByExample(
-        @WebParam(name = "SearchByExample", targetNamespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", partName = "body")
-        SearchByExampleType body)
-        throws XmlSwFault
-    ;
+    @WebMethod
+    public at.gv.util.xsd.ur_V5.xmlsw.SearchResponseType searchByExample(
+        @WebParam(partName = "body", name = "SearchByExample", targetNamespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#")
+        at.gv.util.xsd.ur_V5.xmlsw.SearchByExampleType body
+    ) throws XmlSwFault;
 
     /**
-     *  Operation für den Abfragetyp
-     *         Search by Id
-     *       
-     * 
-     * @param body
-     * @return
-     *     returns at.gv.util.xsd.ur_V5.xmlsw.SearchResponseType
-     * @throws XmlSwFault
+     * Operation für den Abfragetyp
+     *        Search by Id
+     *      
      */
-    @WebMethod
     @WebResult(name = "SearchResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", partName = "body")
-    public SearchResponseType searchById(
-        @WebParam(name = "SearchById", targetNamespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", partName = "body")
-        SearchByIdType body)
-        throws XmlSwFault
-    ;
-
+    @WebMethod
+    public at.gv.util.xsd.ur_V5.xmlsw.SearchResponseType searchById(
+        @WebParam(partName = "body", name = "SearchById", targetNamespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#")
+        at.gv.util.xsd.ur_V5.xmlsw.SearchByIdType body
+    ) throws XmlSwFault;
 }
diff --git a/src/main/java/at/gv/util/wsdl/ur_V5/URSucheService.java b/src/main/java/at/gv/util/wsdl/ur_V5/URSucheService.java
index 8e5fe73..048acdb 100644
--- a/src/main/java/at/gv/util/wsdl/ur_V5/URSucheService.java
+++ b/src/main/java/at/gv/util/wsdl/ur_V5/URSucheService.java
@@ -1,75 +1,81 @@
-
 package at.gv.util.wsdl.ur_V5;
 
-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-16T12:00:10.781+02:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebServiceClient(name = "URSucheService", targetNamespace = "urn:at:statistik:ur:ws", wsdlLocation = "file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/ur_V5/URSucheService.wsdl")
-public class URSucheService
-    extends Service
-{
+@WebServiceClient(name = "URSucheService", 
+                  wsdlLocation = "./src/main/resources/wsdl/ur_V5/URSucheService.wsdl",
+                  targetNamespace = "urn:at:statistik:ur:ws") 
+public class URSucheService extends Service {
 
-    private final static URL URSUCHESERVICE_WSDL_LOCATION;
-    private final static WebServiceException URSUCHESERVICE_EXCEPTION;
-    private final static QName URSUCHESERVICE_QNAME = new QName("urn:at:statistik:ur:ws", "URSucheService");
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("urn:at:statistik:ur:ws", "URSucheService");
+    public final static QName URSucheService = new QName("urn:at:statistik:ur:ws", "URSucheService");
     static {
-        URL url = null;
-        WebServiceException e = null;
-        try {
-            url = new URL("file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/ur_V5/URSucheService.wsdl");
-        } catch (MalformedURLException ex) {
-            e = new WebServiceException(ex);
-        }
-        URSUCHESERVICE_WSDL_LOCATION = url;
-        URSUCHESERVICE_EXCEPTION = e;
+        URL url = URSucheService.class.getResource("./src/main/resources/wsdl/ur_V5/URSucheService.wsdl");
+        if (url == null) {
+            url = URSucheService.class.getClassLoader().getResource("./src/main/resources/wsdl/ur_V5/URSucheService.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(URSucheService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/ur_V5/URSucheService.wsdl");
+        }       
+        WSDL_LOCATION = url;
     }
 
-    public URSucheService() {
-        super(__getWsdlLocation(), URSUCHESERVICE_QNAME);
-    }
-
-//    public URSucheService(WebServiceFeature... features) {
-//        super(__getWsdlLocation(), URSUCHESERVICE_QNAME, features);
-//    }
-
     public URSucheService(URL wsdlLocation) {
-        super(wsdlLocation, URSUCHESERVICE_QNAME);
+        super(wsdlLocation, SERVICE);
     }
 
-//    public URSucheService(URL wsdlLocation, WebServiceFeature... features) {
-//        super(wsdlLocation, URSUCHESERVICE_QNAME, features);
-//    }
-
     public URSucheService(URL wsdlLocation, QName serviceName) {
         super(wsdlLocation, serviceName);
     }
 
-//    public URSucheService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
-//        super(wsdlLocation, serviceName, features);
-//    }
+    public URSucheService() {
+        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 URSucheService(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 URSucheService(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 URSucheService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
 
     /**
-     * 
+     *
      * @return
      *     returns URSuche
      */
     @WebEndpoint(name = "URSucheService")
     public URSuche getURSucheService() {
-        return super.getPort(new QName("urn:at:statistik:ur:ws", "URSucheService"), URSuche.class);
+        return super.getPort(URSucheService, URSuche.class);
     }
 
     /**
@@ -81,14 +87,7 @@ public class URSucheService
      */
     @WebEndpoint(name = "URSucheService")
     public URSuche getURSucheService(WebServiceFeature... features) {
-        return super.getPort(new QName("urn:at:statistik:ur:ws", "URSucheService"), URSuche.class, features);
-    }
-
-    private static URL __getWsdlLocation() {
-        if (URSUCHESERVICE_EXCEPTION!= null) {
-            throw URSUCHESERVICE_EXCEPTION;
-        }
-        return URSUCHESERVICE_WSDL_LOCATION;
+        return super.getPort(URSucheService, URSuche.class, features);
     }
 
 }
diff --git a/src/main/java/at/gv/util/wsdl/ur_V5/XmlSwFault.java b/src/main/java/at/gv/util/wsdl/ur_V5/XmlSwFault.java
index 2f1ee37..bb0f7a9 100644
--- a/src/main/java/at/gv/util/wsdl/ur_V5/XmlSwFault.java
+++ b/src/main/java/at/gv/util/wsdl/ur_V5/XmlSwFault.java
@@ -2,54 +2,42 @@
 package at.gv.util.wsdl.ur_V5;
 
 import javax.xml.ws.WebFault;
-import at.gv.util.xsd.ur_V5.xmlsw.CustomFaultType;
 
 
 /**
- * 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-16T12:00:10.741+02:00
+ * Generated source version: 3.0.1
  */
+
 @WebFault(name = "XmlSwFault", targetNamespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#")
-public class XmlSwFault
-    extends Exception
-{
-
-    /**
-     * Java type that goes as soapenv:Fault detail element.
-     * 
-     */
-    private CustomFaultType faultInfo;
-
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     */
-    public XmlSwFault(String message, CustomFaultType faultInfo) {
+public class XmlSwFault extends Exception {
+    
+    private at.gv.util.xsd.ur_V5.xmlsw.CustomFaultType xmlSwFault;
+
+    public XmlSwFault() {
+        super();
+    }
+    
+    public XmlSwFault(String message) {
         super(message);
-        this.faultInfo = faultInfo;
     }
-
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     * @param cause
-     */
-    public XmlSwFault(String message, CustomFaultType faultInfo, Throwable cause) {
+    
+    public XmlSwFault(String message, Throwable cause) {
         super(message, cause);
-        this.faultInfo = faultInfo;
     }
 
-    /**
-     * 
-     * @return
-     *     returns fault bean: at.gv.util.xsd.ur_V5.xmlsw.CustomFaultType
-     */
-    public CustomFaultType getFaultInfo() {
-        return faultInfo;
+    public XmlSwFault(String message, at.gv.util.xsd.ur_V5.xmlsw.CustomFaultType xmlSwFault) {
+        super(message);
+        this.xmlSwFault = xmlSwFault;
     }
 
+    public XmlSwFault(String message, at.gv.util.xsd.ur_V5.xmlsw.CustomFaultType xmlSwFault, Throwable cause) {
+        super(message, cause);
+        this.xmlSwFault = xmlSwFault;
+    }
+
+    public at.gv.util.xsd.ur_V5.xmlsw.CustomFaultType getFaultInfo() {
+        return this.xmlSwFault;
+    }
 }
diff --git a/src/main/java/at/gv/util/wsdl/ur_V5/package-info.java b/src/main/java/at/gv/util/wsdl/ur_V5/package-info.java
deleted file mode 100644
index 847ecd4..0000000
--- a/src/main/java/at/gv/util/wsdl/ur_V5/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- *  Dieses WSDL-Dokument beschreibt den
- *     XML-Search-Service. 
- * 
- */
-package at.gv.util.wsdl.ur_V5;