You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/08/28 22:27:03 UTC
svn commit: r1378312 -
/cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
Author: dkulp
Date: Tue Aug 28 20:27:03 2012
New Revision: 1378312
URL: http://svn.apache.org/viewvc?rev=1378312&view=rev
Log:
Merged revisions 1378301 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1378301 | dkulp | 2012-08-28 16:19:39 -0400 (Tue, 28 Aug 2012) | 10 lines
Merged revisions 1378290 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1378290 | dkulp | 2012-08-28 16:13:38 -0400 (Tue, 28 Aug 2012) | 2 lines
Remove an import thats not needed in some cases
........
........
Modified:
cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
Modified: cxf/branches/2.5.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.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm?rev=1378312&r1=1378311&r2=1378312&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm (original)
+++ cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm Tue Aug 28 20:27:03 2012
@@ -21,7 +21,9 @@ $service.packageJavaDoc
#end
package $service.PackageName;
+#if ($wsdlLocation != "" && not($useGetResource) && not($wsdlLocation.startsWith("classpath:")))
import java.net.MalformedURLException;
+#end
import java.net.URL;
#if ($mark-generated == "true")
import javax.annotation.Generated;