Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4B1D59F94 for ; Tue, 25 Oct 2011 17:45:14 +0000 (UTC) Received: (qmail 69771 invoked by uid 500); 25 Oct 2011 17:45:14 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 69727 invoked by uid 500); 25 Oct 2011 17:45:14 -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 69720 invoked by uid 99); 25 Oct 2011 17:45:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Oct 2011 17:45:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 25 Oct 2011 17:45:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B49AE23888FD for ; Tue, 25 Oct 2011 17:44:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1188825 - /cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java Date: Tue, 25 Oct 2011 17:44:52 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111025174452.B49AE23888FD@eris.apache.org> Author: dkulp Date: Tue Oct 25 17:44:52 2011 New Revision: 1188825 URL: http://svn.apache.org/viewvc?rev=1188825&view=rev Log: [CXF-3205] Copy XmlJavaTypeAdapter annotations into the generated package-info class. 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=1188825&r1=1188824&r2=1188825&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 Tue Oct 25 17:44:52 2011 @@ -38,6 +38,7 @@ import javax.xml.bind.annotation.XmlList import javax.xml.bind.annotation.XmlMimeType; import javax.xml.bind.annotation.XmlNsForm; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; import javax.xml.namespace.QName; import javax.xml.ws.Holder; @@ -262,11 +263,47 @@ public final class WrapperClassGenerator getClassCode(XmlNsForm.class), q ? "QUALIFIED" : "UNQUALIFIED"); av0.visitEnd(); + + if (clz.getPackage() != null && clz.getPackage().getAnnotations() != null) { + for (Annotation ann : clz.getPackage().getAnnotations()) { + if (ann instanceof XmlJavaTypeAdapters) { + av0 = cw.visitAnnotation("Ljavax/xml/bind/annotation/adapters/XmlJavaTypeAdapters;", + true); + generateXmlJavaTypeAdapters(av0, (XmlJavaTypeAdapters)ann); + av0.visitEnd(); + } else if (ann instanceof XmlJavaTypeAdapter) { + av0 = cw.visitAnnotation("Ljavax/xml/bind/annotation/adapters/XmlJavaTypeAdapter;", + true); + generateXmlJavaTypeAdapter(av0, (XmlJavaTypeAdapter)ann); + av0.visitEnd(); + } + } + } cw.visitEnd(); - + loadClass(className, clz, cw.toByteArray()); } + private void generateXmlJavaTypeAdapters(AnnotationVisitor av, XmlJavaTypeAdapters adapters) { + AnnotationVisitor av1 = av.visitArray("value"); + + for (XmlJavaTypeAdapter adapter : adapters.value()) { + AnnotationVisitor av2 + = av1.visitAnnotation(null, "Ljavax/xml/bind/annotation/adapters/XmlJavaTypeAdapter;"); + generateXmlJavaTypeAdapter(av2, adapter); + av2.visitEnd(); + } + av1.visitEnd(); + } + private void generateXmlJavaTypeAdapter(AnnotationVisitor av, XmlJavaTypeAdapter adapter) { + if (adapter.value() != null) { + av.visit("value", org.objectweb.asm.Type.getType(getClassCode(adapter.value()))); + } + if (adapter.type() != javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter.DEFAULT.class) { + av.visit("type", org.objectweb.asm.Type.getType(getClassCode(adapter.type()))); + } + } + private void generateMessagePart(ClassWriter cw, MessagePartInfo mpi, Method method, String className) { if (Boolean.TRUE.equals(mpi.getProperty(ReflectionServiceFactoryBean.HEADER))) { return; @@ -375,13 +412,7 @@ public final class WrapperClassGenerator av0.visitEnd(); } else if (ann instanceof XmlJavaTypeAdapter) { av0 = fv.visitAnnotation("Ljavax/xml/bind/annotation/adapters/XmlJavaTypeAdapter;", true); - XmlJavaTypeAdapter adapter = (XmlJavaTypeAdapter)ann; - if (adapter.value() != null) { - av0.visit("value", org.objectweb.asm.Type.getType(getClassCode(adapter.value()))); - } - if (adapter.type() != javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter.DEFAULT.class) { - av0.visit("type", org.objectweb.asm.Type.getType(getClassCode(adapter.type()))); - } + generateXmlJavaTypeAdapter(av0, (XmlJavaTypeAdapter)ann); av0.visitEnd(); } else if (ann instanceof XmlAttachmentRef) { av0 = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlAttachmentRef;", true);