Author: ffang
Date: Thu May  5 06:56:41 2011
New Revision: 1099701

URL: http://svn.apache.org/viewvc?rev=1099701&view=rev
Log:
Merged revisions 1099697 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1099697 | ffang | 2011-05-05 14:21:56 +0800 (四, 05  5 2011) | 1 line
  
  [CXF-3491]can't refer to java.lang.Exception in gererated client/server main code
........

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/client.vm
    cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm
    cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java

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/client.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/client.vm?rev=1099701&r1=1099700&r2=1099701&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm (original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm Thu May  5 06:56:41 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/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.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/server.vm?rev=1099701&r1=1099700&r2=1099701&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm (original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm Thu May  5 06:56:41 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/branches/2.3.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=1099701&r1=1099700&r2=1099701&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Thu May  5 06:56:41 2011
@@ -1179,8 +1179,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");