axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ami...@apache.org
Subject svn commit: r550806 - in /webservices/axis2/trunk/java/modules/adb-codegen: src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl test-resources/testsuite/testattribute.xsd
Date Tue, 26 Jun 2007 13:57:44 GMT
Author: amilas
Date: Tue Jun 26 06:57:40 2007
New Revision: 550806

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

Modified:
    webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
    webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/testattribute.xsd

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=550806&r1=550805&r2=550806
==============================================================================
--- 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 Jun 26 06:57:40 2007
@@ -2461,7 +2461,14 @@
                     <xsl:if test="$propertyName != 'extraAttributes'">
                     // handle attribute "<xsl:value-of select="$propertyName"/>"
                     java.lang.String <xsl:value-of select="$attribName"/> =
-                      reader.getAttributeValue("<xsl:value-of select="$namespace"/>","<xsl:value-of
select="$propertyName"/>");
+                        <xsl:choose>
+                            <xsl:when test="string-length(normalize-space($namespace))
> 0">
+                                reader.getAttributeValue("<xsl:value-of select="$namespace"/>","<xsl:value-of
select="$propertyName"/>");
+                            </xsl:when>
+                            <xsl:otherwise>
+                                reader.getAttributeValue(null,"<xsl:value-of select="$propertyName"/>");
+                            </xsl:otherwise>
+                        </xsl:choose>
                    if (<xsl:value-of select="$attribName"/>!=null){
                          java.lang.String content = <xsl:value-of select="$attribName"/>;
                         <xsl:choose>

Modified: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/testattribute.xsd
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/testattribute.xsd?view=diff&rev=550806&r1=550805&r2=550806
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/testattribute.xsd
(original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/testattribute.xsd
Tue Jun 26 06:57:40 2007
@@ -1,4 +1,5 @@
 <xs:schema elementFormDefault="qualified"
+           attributeFormDefault="qualified"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            xmlns:tns="http://tempuri.org/attribute"
            targetNamespace="http://tempuri.org/attribute">



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


Mime
View raw message