From: Jason T. G. <nih...@us...> - 2004-12-01 20:10:49
|
User: nihility Date: 04/12/01 12:10:40 Modified: src/main/org/jboss/webservice/deployment Tag: Branch_4_0 BeanXMLMetaData.java Log: Add itemXmlType attribute to elementDesc in typeMapping, which allows you to specify the xml type of an array element during literal array serialization. Fix MarshallDocLiteralTestCase and jdk1.5 compatibility by using this new attribute. Revision Changes Path No revision No revision 1.1.2.2 +14 -3 webservice/src/main/org/jboss/webservice/deployment/BeanXMLMetaData.java Index: BeanXMLMetaData.java =================================================================== RCS file: /cvsroot/jboss/webservice/src/main/org/jboss/webservice/deployment/BeanXMLMetaData.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- BeanXMLMetaData.java 17 Nov 2004 10:51:34 -0000 1.1.2.1 +++ BeanXMLMetaData.java 1 Dec 2004 20:10:40 -0000 1.1.2.2 @@ -6,7 +6,7 @@ */ package org.jboss.webservice.deployment; -// $Id: BeanXMLMetaData.java,v 1.1.2.1 2004/11/17 10:51:34 tdiesler Exp $ +// $Id: BeanXMLMetaData.java,v 1.1.2.2 2004/12/01 20:10:40 nihility Exp $ import org.apache.axis.utils.LinkedHashMap; import org.jboss.webservice.util.DOMUtils; @@ -43,6 +43,7 @@ * <elementDesc fieldName="varSoapShort" xmlName="varSoapShort" xmlType="soapenc:short"/> * <elementDesc fieldName="varSoapByte" xmlName="varSoapByte" xmlType="soapenc:byte"/> * <elementDesc fieldName="varSoapBase64" xmlName="varSoapBase64" xmlType="soapenc:base64"/> + * <elementDesc fieldName="varDateTimeArray" xmlName="varDateTimeArray" itemXmlType="xsd:datetime"/> * <elementOrder> * <element name="varString"/> * <element name="varInteger"/> @@ -68,6 +69,7 @@ * <element name="varHexBinary"/> * <element name="varSoapBase64"/> * <element name="varSequenceStruct"/> + * <element name="varDateTimeArray"/> * </elementOrder> * </typeDesc> * </typeMapping> @@ -118,7 +120,9 @@ boolean asAttribute = DOMUtils.getAttributeValueAsBoolean(elDesc, "asAttr"); boolean asContent = DOMUtils.getAttributeValueAsBoolean(elDesc, "asContent"); - ElementMetaData elMetaData = new ElementMetaData(fieldName, xmlName, xmlType, asAttribute, asContent); + QName itemXmlType = DOMUtils.getAttributeValueAsQName(elDesc, "itemXmlType"); + + ElementMetaData elMetaData = new ElementMetaData(fieldName, xmlName, xmlType, itemXmlType, asAttribute, asContent); beanMetaData.elementDescMap.put(fieldName, elMetaData); } @@ -189,14 +193,16 @@ private String fieldName; private QName xmlName; private QName xmlType; + private QName itemXmlType; private boolean asAttribute; private boolean asContent; - public ElementMetaData(String fieldName, QName xmlName, QName xmlType, boolean asAttribute, boolean asContent) + public ElementMetaData(String fieldName, QName xmlName, QName xmlType, QName itemXmlType, boolean asAttribute, boolean asContent) { this.fieldName = fieldName; this.xmlName = xmlName; this.xmlType = xmlType; + this.itemXmlType = itemXmlType; this.asAttribute = asAttribute; this.asContent = asContent; } @@ -216,6 +222,11 @@ return xmlType; } + public QName getItemXmlType() + { + return itemXmlType; + } + public boolean isAsAttribute() { return asAttribute; |