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 2011/01/04 20:39:10 UTC
svn commit: r1055160 - in /cxf/branches/2.3.x-fixes: ./
tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/
tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/
Author: dkulp
Date: Tue Jan 4 19:39:09 2011
New Revision: 1055160
URL: http://svn.apache.org/viewvc?rev=1055160&view=rev
Log:
Merged revisions 1055151 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1055151 | dkulp | 2011-01-04 14:33:12 -0500 (Tue, 04 Jan 2011) | 2 lines
[CXF-3229] If exception name is Exception, use fully qualified name for
the superclass
........
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/generators/FaultGenerator.java
cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
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/generators/FaultGenerator.java
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/generators/FaultGenerator.java?rev=1055160&r1=1055159&r2=1055160&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java (original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java Tue Jan 4 19:39:09 2011
@@ -90,6 +90,13 @@ public class FaultGenerator extends Abst
for (JavaField jf : expClz.getFields()) {
setAttributes("paraName", ProcessorUtil.mangleNameToVariableName(jf.getName()));
}
+
+ String exceptionSuperclass = "Exception";
+ if (expClz.getName().equals(exceptionSuperclass)) {
+ exceptionSuperclass = "java.lang.Exception";
+ }
+ setAttributes("exceptionSuperclass", exceptionSuperclass);
+
setCommonAttributes();
doWrite(FAULT_TEMPLATE, parseOutputName(expClz.getPackageName(),
expClz.getName()));
Modified: cxf/branches/2.3.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.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm?rev=1055160&r1=1055159&r2=1055160&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm (original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm Tue Jan 4 19:39:09 2011
@@ -36,7 +36,7 @@ import javax.xml.ws.WebFault;
#if ($mark-generated == "true")
@Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate", comments = "$fullversion")
#end
-public class $expClass.Name extends Exception {
+public class $expClass.Name extends $exceptionSuperclass {
#if ($mark-generated == "true")
@Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate")
#end