Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 95349 invoked from network); 16 Nov 2004 05:21:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 16 Nov 2004 05:21:23 -0000 Received: (qmail 38798 invoked by uid 500); 16 Nov 2004 05:21:22 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 38764 invoked by uid 500); 16 Nov 2004 05:21:22 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 38750 invoked by uid 99); 16 Nov 2004 05:21:21 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 15 Nov 2004 21:21:21 -0800 Received: (qmail 95220 invoked by uid 1845); 16 Nov 2004 05:21:00 -0000 Date: 16 Nov 2004 05:21:00 -0000 Message-ID: <20041116052100.95219.qmail@minotaur.apache.org> From: gawor@apache.org To: ws-axis-cvs@apache.org Subject: cvs commit: ws-axis/java/src/org/apache/axis/encoding/ser QNameSerializer.java SimpleListSerializer.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N gawor 2004/11/15 21:21:00 Modified: java/src/org/apache/axis/encoding/ser QNameSerializer.java SimpleListSerializer.java Log: a fix for qname serialization when a default namespace is set Revision Changes Path 1.11 +18 -2 ws-axis/java/src/org/apache/axis/encoding/ser/QNameSerializer.java Index: QNameSerializer.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/ser/QNameSerializer.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- QNameSerializer.java 25 Feb 2004 14:02:37 -0000 1.10 +++ QNameSerializer.java 16 Nov 2004 05:21:00 -0000 1.11 @@ -46,10 +46,26 @@ context.endElement(); } - public String getValueAsString(Object value, SerializationContext context) { - return context.qName2String((QName)value); + public static String qName2String(QName qname, + SerializationContext context) { + String str = context.qName2String(qname); + // work around for default namespace + if (str == qname.getLocalPart()) { + String namespace = qname.getNamespaceURI(); + if (namespace != null && namespace.length() > 0) { + String prefix = + context.getPrefixForURI(qname.getNamespaceURI(), + null, true); + return prefix + ":" + str; + } + } + return str; } + public String getValueAsString(Object value, SerializationContext context) { + return qName2String((QName)value, context); + } + public String getMechanismType() { return Constants.AXIS_SAX; } /** 1.4 +1 -1 ws-axis/java/src/org/apache/axis/encoding/ser/SimpleListSerializer.java Index: SimpleListSerializer.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/ser/SimpleListSerializer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SimpleListSerializer.java 23 Mar 2004 10:45:06 -0000 1.3 +++ SimpleListSerializer.java 16 Nov 2004 05:21:00 -0000 1.4 @@ -116,7 +116,7 @@ } } else if (object instanceof QName) { - result.append( context.qName2String((QName)object) ); + result.append(QNameSerializer.qName2String((QName)object, context)); } else { result.append(object.toString());