Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 20872 invoked from network); 14 Jan 2008 16:02:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Jan 2008 16:02:40 -0000 Received: (qmail 41501 invoked by uid 500); 14 Jan 2008 16:02:29 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 41462 invoked by uid 500); 14 Jan 2008 16:02:29 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 41453 invoked by uid 99); 14 Jan 2008 16:02:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Jan 2008 08:02:29 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Jan 2008 16:02:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B1DAD1A983A; Mon, 14 Jan 2008 08:02:15 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r611838 - /incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Date: Mon, 14 Jan 2008 16:02:14 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080114160215.B1DAD1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Jan 14 08:02:13 2008 New Revision: 611838 URL: http://svn.apache.org/viewvc?rev=611838&view=rev Log: [CXF-1392] Fix problems of always qualifying exception elements Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=611838&r1=611837&r2=611838&view=diff ============================================================================== --- incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java (original) +++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Mon Jan 14 08:02:13 2008 @@ -73,6 +73,7 @@ import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.service.model.MessagePartInfo; +import org.apache.cxf.service.model.SchemaInfo; import org.apache.cxf.staxutils.StaxUtils; import org.apache.cxf.staxutils.W3CDOMStreamWriter; import org.apache.ws.commons.schema.XmlSchemaElement; @@ -290,7 +291,7 @@ XMLStreamWriter writer = getStreamWriter(source); QName qn = part.getElementQName(); try { - writer.writeStartElement(qn.getNamespaceURI(), qn.getLocalPart()); + writer.writeStartElement("ns1", qn.getLocalPart(), qn.getNamespaceURI()); Class cls = part.getTypeClass(); XmlAccessorType accessorType = cls.getAnnotation(XmlAccessorType.class); if (accessorType == null && cls.getPackage() != null) { @@ -299,6 +300,14 @@ XmlAccessType accessType = accessorType != null ? accessorType.value() : XmlAccessType.PUBLIC_MEMBER; String namespace = part.getElementQName().getNamespaceURI(); + + SchemaInfo sch = part.getMessageInfo().getOperation().getInterface() + .getService().getSchema(namespace); + if (!sch.isElementFormQualified()) { + namespace = null; + } + + Marshaller u = createMarshaller(context, cls, marshallerProperties); try { // override anything the user asked us to set.