Author: dkulp
Date: Tue Jan 4 19:33:12 2011
New Revision: 1055151
URL: http://svn.apache.org/viewvc?rev=1055151&view=rev
Log:
[CXF-3229] If exception name is Exception, use fully qualified name for
the superclass
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java?rev=1055151&r1=1055150&r2=1055151&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
Tue Jan 4 19:33:12 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/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm?rev=1055151&r1=1055150&r2=1055151&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
Tue Jan 4 19:33:12 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
