Author: dkulp
Date: Fri Jun 6 14:13:07 2008
New Revision: 664128
URL: http://svn.apache.org/viewvc?rev=664128&view=rev
Log:
Merged revisions 664127 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r664127 | dkulp | 2008-06-06 17:11:17 -0400 (Fri, 06 Jun 2008) | 2 lines
[CXF-1586] If wsdlLocation is empty, don't output the wsdlLocation attributes
on the annotations.
........
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/parent/pom.xml
cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=664128&r1=664127&r2=664128&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/parent/pom.xml Fri Jun 6 14:13:07 2008
@@ -334,6 +334,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/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java?rev=664128&r1=664127&r2=664128&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
(original)
+++
cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
Fri Jun 6 14:13:07 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/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm?rev=664128&r1=664127&r2=664128&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
(original)
+++
cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
Fri Jun 6 14:13:07 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/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm?rev=664128&r1=664127&r2=664128&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
(original)
+++
cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
Fri Jun 6 14:13:07 2008
@@ -37,7 +37,11 @@
*
*/
[EMAIL PROTECTED](name = "${service.ServiceName}", targetNamespace =
"$service.Namespace", wsdlLocation = "$wsdlLocation")
[EMAIL PROTECTED](name = "${service.ServiceName}",
+#if ($wsdlLocation != "")
+ wsdlLocation = "$wsdlLocation",
+#end
+ targetNamespace = "$service.Namespace")
#foreach ($annotation in $service.Annotations)
$annotation
#end
@@ -49,6 +53,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");
@@ -57,6 +62,9 @@
// e.printStackTrace();
}
WSDL_LOCATION = url;
+#else
+ WSDL_LOCATION = null;
+#end
}
public ${service.Name}(URL wsdlLocation) {
