geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r515798 - in /geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf: CXFEndpoint.java ejb/EJBEndpoint.java pojo/POJOEndpoint.java
Date Wed, 07 Mar 2007 22:05:17 GMT
Author: gawor
Date: Wed Mar  7 14:05:17 2007
New Revision: 515798

URL: http://svn.apache.org/viewvc?view=rev&rev=515798
Log:
property resolve wsdlLocation attribute of WebService annotation

Modified:
    geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
    geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java
    geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java

Modified: geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java?view=diff&rev=515798&r1=515797&r2=515798
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
(original)
+++ geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
Wed Mar  7 14:05:17 2007
@@ -64,21 +64,19 @@
   
     protected URL getWsdlURL(URL configurationBaseUrl, String wsdlFile) {
         URL wsdlURL = null;
-        if (wsdlFile != null) {
-
+        if (wsdlFile != null && wsdlFile.trim().length() > 0) {
+            wsdlFile = wsdlFile.trim();
             try {
                 wsdlURL = new URL(wsdlFile);
             } catch (MalformedURLException e) {
                 // Not a URL, try as a resource
-                wsdlURL = this.implementor.getClass().getResource(
-                        "/" + wsdlFile);
+                wsdlURL = this.implementor.getClass().getResource("/" + wsdlFile);
 
                 if (wsdlURL == null && configurationBaseUrl != null) {
                     // Cannot get it as a resource, try with
                     // configurationBaseUrl
                     try {
-                        wsdlURL = new URL(configurationBaseUrl.toString()
-                                + wsdlFile);
+                        wsdlURL = new URL(configurationBaseUrl, wsdlFile);
                     } catch (MalformedURLException ee) {
                         // ignore
                     }

Modified: geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java?view=diff&rev=515798&r1=515797&r2=515798
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java
(original)
+++ geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java
Wed Mar  7 14:05:17 2007
@@ -45,10 +45,13 @@
         serviceFactory = new JaxWsServiceFactoryBean(implInfo);       
         serviceFactory.setBus(bus);
 
-        /*
-         * TODO: The WSDL processing needs to be improved
-         */
-        URL wsdlURL = getWsdlURL(configurationBaseUrl, this.portInfo.getWsdlFile());
+        String wsdlLocation = null;
+        if (this.portInfo.getWsdlFile() != null) {
+            wsdlLocation = this.portInfo.getWsdlFile();
+        } else {
+            wsdlLocation = implInfo.getWsdlLocation();
+        }        
+        URL wsdlURL = getWsdlURL(configurationBaseUrl, wsdlLocation);
 
         // install as first to overwrite annotations (wsdl-file, wsdl-port, wsdl-service)
         CXFServiceConfiguration configuration = 

Modified: geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java?view=diff&rev=515798&r1=515797&r2=515798
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java
(original)
+++ geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java
Wed Mar  7 14:05:17 2007
@@ -56,10 +56,13 @@
         serviceFactory = new JaxWsServiceFactoryBean(implInfo);        
         serviceFactory.setBus(bus);
                 
-        /*
-         * TODO: The WSDL processing needs to be improved
-         */
-        URL wsdlURL = getWsdlURL(configurationBaseUrl, this.portInfo.getWsdlFile());
+        String wsdlLocation = null;
+        if (this.portInfo.getWsdlFile() != null) {
+            wsdlLocation = this.portInfo.getWsdlFile();
+        } else {
+            wsdlLocation = implInfo.getWsdlLocation();
+        }        
+        URL wsdlURL = getWsdlURL(configurationBaseUrl, wsdlLocation);
 
         // install as first to overwrite annotations (wsdl-file, wsdl-port, wsdl-service)
         CXFServiceConfiguration configuration = 



Mime
View raw message