cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1461291 - in /cxf/branches/2.7.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws: generators/FaultGenerator.java template/fault.vm
Date Tue, 26 Mar 2013 20:05:02 GMT
Author: dkulp
Date: Tue Mar 26 20:05:01 2013
New Revision: 1461291

URL: http://svn.apache.org/r1461291
Log:
Merged revisions 1461285 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1461285 | dkulp | 2013-03-26 15:53:45 -0400 (Tue, 26 Mar 2013) | 2 lines

  Fix issue with exception superclasses not having the imports set.

........

Modified:
    cxf/branches/2.7.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
    cxf/branches/2.7.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm

Modified: cxf/branches/2.7.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java?rev=1461291&r1=1461290&r2=1461291&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
(original)
+++ cxf/branches/2.7.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
Tue Mar 26 20:05:01 2013
@@ -129,7 +129,10 @@ public class FaultGenerator extends Abst
                     exceptionSuperclassString = exceptionSuperclass;
                 }
                 setAttributes("exceptionSuperclass", exceptionSuperclassString);
-
+                if (!exceptionSuperclass.startsWith("java.lang.")
+                    && !exceptionSuperclassString.equals(exceptionSuperclass)) {
+                    expClz.addImport(exceptionSuperclass);
+                }
                 setCommonAttributes();
                 doWrite(FAULT_TEMPLATE, parseOutputName(expClz.getPackageName(),
                         expClz.getName()));

Modified: cxf/branches/2.7.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm?rev=1461291&r1=1461290&r2=1461291&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
(original)
+++ cxf/branches/2.7.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
Tue Mar 26 20:05:01 2013
@@ -21,6 +21,9 @@ package $expClass.PackageName;
 import javax.annotation.Generated;
 #end
 import javax.xml.ws.WebFault;
+#foreach ($import in $expClass.Imports)
+import ${import};
+#end
 
 
 /**



Mime
View raw message