Author: dkulp Date: Thu Mar 28 16:09:43 2013 New Revision: 1462186 URL: http://svn.apache.org/r1462186 Log: Merged revisions 1461308 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1461308 | dkulp | 2013-03-26 16:53:15 -0400 (Tue, 26 Mar 2013) | 18 lines Merged revisions 1461291 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1461291 | dkulp | 2013-03-26 16:05:01 -0400 (Tue, 26 Mar 2013) | 10 lines 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.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm Modified: cxf/branches/2.5.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.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java?rev=1462186&r1=1462185&r2=1462186&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java (original) +++ cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java Thu Mar 28 16:09:43 2013 @@ -132,7 +132,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.5.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.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm?rev=1462186&r1=1462185&r2=1462186&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm (original) +++ cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm Thu Mar 28 16:09:43 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 /**
