You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2006/10/20 17:10:15 UTC
svn commit: r466143 - in
/webservices/axis2/branches/java/1_1/modules/adb-codegen: ./
src/org/apache/axis2/schema/template/ test/org/apache/axis2/schema/testsuite/
Author: chinthaka
Date: Fri Oct 20 08:10:14 2006
New Revision: 466143
URL: http://svn.apache.org/viewvc?view=rev&rev=466143
Log:
Applying the patch in https://issues.apache.org/jira/browse/AXIS2-1468 with minor modifications. Thanks Amila.
Modified:
webservices/axis2/branches/java/1_1/modules/adb-codegen/project.xml
webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
webservices/axis2/branches/java/1_1/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/CustomElementsTest.java
webservices/axis2/branches/java/1_1/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/IntElementsTest.java
Modified: webservices/axis2/branches/java/1_1/modules/adb-codegen/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb-codegen/project.xml?view=diff&rev=466143&r1=466142&r2=466143
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb-codegen/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/adb-codegen/project.xml Fri Oct 20 08:10:14 2006
@@ -156,12 +156,6 @@
<includes>
<include>**/*Test.java</include>
</includes>
- <excludes>
- <exclude>**/*CustomElementsTest*.java</exclude>
- <exclude>**/*IntElementsTest*.java</exclude>
- <exclude>**/*StringElementsTest*.java</exclude>
- <exclude>**/*Abstract*.java</exclude>
- </excludes>
</unitTest>
<resources>
<resource>
Modified: webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl?view=diff&rev=466143&r1=466142&r2=466143
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl (original)
+++ webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl Fri Oct 20 08:10:14 2006
@@ -1341,13 +1341,16 @@
<xsl:when test="(@ours or @default) and @array">
if (<xsl:value-of select="$varName"/>!=null) {
for (int i = 0;i < <xsl:value-of select="$varName"/>.length;i++){
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
+
if (<xsl:value-of select="$varName"/>[i] != null){
+ elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
+ "<xsl:value-of select="$propertyName"/>"));
elementList.add(<xsl:value-of select="$varName"/>[i]);
} else {
<xsl:choose>
<xsl:when test="@nillable">
+ elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
+ "<xsl:value-of select="$propertyName"/>"));
elementList.add(null);
</xsl:when>
<xsl:when test="$min=0">
@@ -1363,6 +1366,8 @@
} else {
<xsl:choose>
<xsl:when test="@nillable">
+ elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
+ "<xsl:value-of select="$propertyName"/>"));
elementList.add(<xsl:value-of select="$varName"/>);
</xsl:when>
<xsl:otherwise>
@@ -1385,6 +1390,8 @@
} else {
<xsl:choose>
<xsl:when test="@nillable">
+ elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
+ "<xsl:value-of select="$propertyName"/>"));
elementList.add(null);
</xsl:when>
<xsl:when test="$min=0">
@@ -1408,6 +1415,8 @@
} else {
<xsl:choose>
<xsl:when test="@nillable">
+ elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
+ "<xsl:value-of select="$propertyName"/>"));
elementList.add(null);
</xsl:when>
<xsl:otherwise>
Modified: webservices/axis2/branches/java/1_1/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/CustomElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/CustomElementsTest.java?view=diff&rev=466143&r1=466142&r2=466143
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/CustomElementsTest.java (original)
+++ webservices/axis2/branches/java/1_1/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/CustomElementsTest.java Fri Oct 20 08:10:14 2006
@@ -159,7 +159,6 @@
returnObject = testCustom(getBookInformation(), MIN_EQUALS_ZERO_NILLABLE_TRUE_TEST);
assertTrue(isBookInformationObjectsEquals(returnObject,getBookInformation()));
} catch (Exception e) {
- e.printStackTrace();
fail();
}
System.out.println("minOccurs = 0 and nillable false");
Modified: webservices/axis2/branches/java/1_1/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/IntElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/IntElementsTest.java?view=diff&rev=466143&r1=466142&r2=466143
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/IntElementsTest.java (original)
+++ webservices/axis2/branches/java/1_1/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/IntElementsTest.java Fri Oct 20 08:10:14 2006
@@ -42,7 +42,6 @@
returnObject = testIntArray(new int[]{5}, MIN_EQUALS_ZERO_NILLABLE_TRUE_TEST);
assertTrue(Arrays.equals(returnObject, new int[]{5}));
} catch (Exception e) {
- e.printStackTrace();
fail();
}
System.out.println("minOccurs = 0 nillable false");
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org