You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by am...@apache.org on 2007/07/18 06:48:27 UTC

svn commit: r557148 - /webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl

Author: amilas
Date: Tue Jul 17 21:48:26 2007
New Revision: 557148

URL: http://svn.apache.org/viewvc?view=rev&rev=557148
Log:
fixed the issue Axis2 - 2922

Modified:
    webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl

Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl?view=diff&rev=557148&r1=557147&r2=557148
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl Tue Jul 17 21:48:26 2007
@@ -2062,14 +2062,30 @@
                         <!-- handle binary - Since it is a Datahandler, we can just add it to the list
                           and the ADB pullparser would handle it right-->
                          <xsl:when test="@binary">
-                            elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
-                                                                      "<xsl:value-of select="$propertyName"/>"));
+                            <xsl:choose>
+                                <xsl:when test="$simple">
+                                      elementList.add(org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT);
+                                </xsl:when>
+                                <xsl:otherwise>
+                                      elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
+                                        "<xsl:value-of select="$propertyName"/>"));
+                                </xsl:otherwise>
+                            </xsl:choose>
                             elementList.add(<xsl:value-of select="$varName"/>);
                         </xsl:when>
                         <!-- the usual case!!!!-->
                         <xsl:otherwise>
-                             elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
+                             <xsl:choose>
+                                 <xsl:when test="$simple">
+                                     <!-- if the type is simple then  this must be only the element text -->
+                                     elementList.add(org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT);
+                                 </xsl:when>
+                                 <xsl:otherwise>
+                                      elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
                                                                       "<xsl:value-of select="$propertyName"/>"));
+                                 </xsl:otherwise>
+                             </xsl:choose>
+
                             <xsl:if test="@primitive">
                                 elementList.add(
                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>));



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org