Author: dkulp
Date: Thu Apr 7 22:08:23 2011
New Revision: 1090046
URL: http://svn.apache.org/viewvc?rev=1090046&view=rev
Log:
Merged revisions 1090033 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1090033 | dkulp | 2011-04-07 17:39:29 -0400 (Thu, 07 Apr 2011) | 3 lines
[CXF-3265] Change to using fully qualified j.u.l Logger to log issue
about unresolvable wsdl URL which should allow the user to at least
direct it someplace other than System.err
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.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.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm?rev=1090046&r1=1090045&r2=1090046&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
(original)
+++
cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
Thu Apr 7 22:08:23 2011
@@ -76,17 +76,20 @@ public class ${service.Name} extends ${s
public final static QName $port.Name = new QName("$service.Namespace",
"$port.PortName");
#end
static {
-#if ($wsdlLocation != "")
+#if ($wsdlLocation == "")
+ WSDL_LOCATION = null;
+#elseif ($wsdlLocation == "null")
+ WSDL_LOCATION = null;
+#else
URL url = null;
try {
url = new URL("$wsdlLocation");
} catch (MalformedURLException e) {
- System.err.println("Can not initialize the default wsdl from
$wsdlLocation");
- // e.printStackTrace();
+ java.util.logging.Logger.getLogger(${service.Name}.class.getName())
+ .log(java.util.logging.Level.INFO,
+ "Can not initialize the default wsdl from {0}",
"$wsdlLocation");
}
WSDL_LOCATION = url;
-#else
- WSDL_LOCATION = null;
#end
}
