Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 39384 invoked from network); 4 Jan 2011 19:39:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Jan 2011 19:39:31 -0000 Received: (qmail 41028 invoked by uid 500); 4 Jan 2011 19:39:30 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 40957 invoked by uid 500); 4 Jan 2011 19:39:30 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 40950 invoked by uid 99); 4 Jan 2011 19:39:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jan 2011 19:39:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jan 2011 19:39:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3AC33238890A; Tue, 4 Jan 2011 19:39:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Tue, 04 Jan 2011 19:39:10 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110104193910.3AC33238890A@eris.apache.org> 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