cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r664127 - in /cxf/trunk: parent/ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/
Date Fri, 06 Jun 2008 21:11:17 GMT
Author: dkulp
Date: Fri Jun  6 14:11:17 2008
New Revision: 664127

URL: http://svn.apache.org/viewvc?rev=664127&view=rev
Log:
[CXF-1586] If wsdlLocation is empty, don't output the wsdlLocation attributes on the annotations.

Modified:
    cxf/trunk/parent/pom.xml
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=664127&r1=664126&r2=664127&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri Jun  6 14:11:17 2008
@@ -385,6 +385,10 @@
                 <version>1.6.2</version>
                 <exclusions>
                     <exclusion>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>servlet-api</artifactId>
+                    </exclusion>
+                    <exclusion>
                         <groupId>xerces</groupId>
                         <artifactId>xercesImpl</artifactId>
                     </exclusion>

Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java?rev=664127&r1=664126&r2=664127&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
(original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
Fri Jun  6 14:11:17 2008
@@ -109,8 +109,7 @@
 
             String url = (String)env.get(ToolConstants.CFG_WSDLURL);
             String location = (String)env.get(ToolConstants.CFG_WSDLLOCATION);
-            if (location == null 
-                || "".equals(location)) {
+            if (location == null) {
                 location = url;
             }
             

Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm?rev=664127&r1=664126&r2=664127&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
(original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
Fri Jun  6 14:11:17 2008
@@ -37,8 +37,10 @@
 @javax.jws.WebService(name = "$intf.Name",
                       serviceName = "$service.ServiceName",
                       portName = "$port",
-                      targetNamespace = "$service.Namespace", 
+                      targetNamespace = "$service.Namespace",
+#if ($intf.Location != "") 
                       wsdlLocation = "$intf.Location",
+#end
                       endpointInterface = "$intf.PackageName.$intf.Name")
                       
 public class ${intf.Name}Impl implements $intf.Name {

Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm?rev=664127&r1=664126&r2=664127&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
(original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
Fri Jun  6 14:11:17 2008
@@ -43,7 +43,11 @@
  * $service.classJavaDoc
  */
 
-@WebServiceClient(name = "${service.ServiceName}", targetNamespace = "$service.Namespace",
wsdlLocation = "$wsdlLocation")
+@WebServiceClient(name = "${service.ServiceName}", 
+#if ($wsdlLocation != "")
+                  wsdlLocation = "$wsdlLocation",
+#end
+                  targetNamespace = "$service.Namespace") 
 #foreach ($annotation in $service.Annotations)
 $annotation
 #end
@@ -55,6 +59,7 @@
     public final static QName $port.Name = new QName("$service.Namespace", "$port.PortName");
 #end
     static {
+#if ($wsdlLocation != "")
         URL url = null;
         try {
             url = new URL("$wsdlLocation");
@@ -63,6 +68,9 @@
             // e.printStackTrace();
         }
         WSDL_LOCATION = url;
+#else
+        WSDL_LOCATION = null;
+#end
     }
 
     public ${service.Name}(URL wsdlLocation) {



Mime
View raw message