Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 94365 invoked from network); 7 Jan 2011 20:18:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Jan 2011 20:18:56 -0000 Received: (qmail 99034 invoked by uid 500); 7 Jan 2011 20:18:56 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 98993 invoked by uid 500); 7 Jan 2011 20:18:56 -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 98986 invoked by uid 99); 7 Jan 2011 20:18:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jan 2011 20:18:56 +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; Fri, 07 Jan 2011 20:18:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 04CD423889EB; Fri, 7 Jan 2011 20:18:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1056487 - /cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java Date: Fri, 07 Jan 2011 20:18:33 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110107201834.04CD423889EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Jan 7 20:18:33 2011 New Revision: 1056487 URL: http://svn.apache.org/viewvc?rev=1056487&view=rev Log: Make sure the WebParam name is used Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java?rev=1056487&r1=1056486&r2=1056487&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java Fri Jan 7 20:18:33 2011 @@ -321,7 +321,7 @@ public final class WrapperClassGenerator List jaxbAnnos = getJaxbAnnos(mpi); - if (!addJAXBAnnotations(fv, jaxbAnnos)) { + if (!addJAXBAnnotations(fv, jaxbAnnos, name)) { AnnotationVisitor av0 = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlElement;", true); av0.visit("name", name); if (factory.isWrapperPartQualified(mpi)) { @@ -363,7 +363,9 @@ public final class WrapperClassGenerator } - private boolean addJAXBAnnotations(FieldVisitor fv, List jaxbAnnos) { + private boolean addJAXBAnnotations(FieldVisitor fv, + List jaxbAnnos, + String name) { AnnotationVisitor av0; boolean addedEl = false; for (Annotation ann : jaxbAnnos) { @@ -391,7 +393,11 @@ public final class WrapperClassGenerator addedEl = true; XmlElement el = (XmlElement)ann; av0 = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlElement;", true); - av0.visit("name", el.name()); + if ("##default".equals(el.name())) { + av0.visit("name", name); + } else { + av0.visit("name", el.name()); + } av0.visit("nillable", el.nillable()); av0.visit("required", el.required()); av0.visit("namespace", el.namespace());