You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2011/05/05 08:21:56 UTC
svn commit: r1099697 - in /cxf/trunk/tools/wsdlto:
frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/
test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/
Author: ffang
Date: Thu May 5 06:21:56 2011
New Revision: 1099697
URL: http://svn.apache.org/viewvc?rev=1099697&view=rev
Log:
[CXF-3491]can't refer to java.lang.Exception in gererated client/server main code
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm?rev=1099697&r1=1099696&r2=1099697&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm Thu May 5 06:21:56 2011
@@ -61,7 +61,7 @@ public final class ${clientClassName} {
#if ($mark-generated == "true")
@Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate")
#end
- public static void main(String args[]) throws Exception {
+ public static void main(String args[]) throws java.lang.Exception {
URL wsdlURL = ${service.Name}.WSDL_LOCATION;
if (args.length > 0) {
File wsdlFile = new File(args[0]);
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm?rev=1099697&r1=1099696&r2=1099697&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm Thu May 5 06:21:56 2011
@@ -37,7 +37,7 @@ public class ${serverClassName}{
#if ($mark-generated == "true")
@Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate")
#end
- protected ${serverClassName}() throws Exception {
+ protected ${serverClassName}() throws java.lang.Exception {
System.out.println("Starting Server");
Object implementor = new ${impl}();
String address = "${address}";
@@ -47,7 +47,7 @@ public class ${serverClassName}{
#if ($mark-generated == "true")
@Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate")
#end
- public static void main(String args[]) throws Exception {
+ public static void main(String args[]) throws java.lang.Exception {
new ${serverClassName}();
System.out.println("Server ready...");
Modified: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=1099697&r1=1099696&r2=1099697&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original)
+++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Thu May 5 06:21:56 2011
@@ -1177,8 +1177,9 @@ public class CodeGenBugTest extends Abst
}
@Test
- public void testCXF3353() throws Exception {
+ public void testCXF3353andCXF3491() throws Exception {
try {
+ env.put(ToolConstants.CFG_ALL, "all");
env.put(ToolConstants.CFG_COMPILE, "compile");
env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes");