Author: veithen
Date: Mon Sep 18 23:18:12 2017
New Revision: 1808790
URL: http://svn.apache.org/viewvc?rev=1808790&view=rev
Log:
AXIS2-5887: Merge r1808789 (with changes) to the 1.7 branch.
Added:
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5887/
- copied from r1808789,
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5887/
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/resources/
- copied from r1808789,
axis/axis2/java/core/trunk/modules/adb-tests/src/test/resources/
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/wsdl/AXIS2-5887.wsdl
- copied unchanged from r1808789,
axis/axis2/java/core/trunk/modules/adb-tests/src/test/wsdl/AXIS2-5887.wsdl
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/adb-codegen/ (props changed)
axis/axis2/java/core/branches/1_7/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 18 23:18:12 2017
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1735801,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1779069,1779074,1780290,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1797823,1799068,1800495,1
803414,1805563,1806088,1806292,1806303-1806305,1806309,1806319,1806344,1806349-1806350,1806577,1806581,1806719,1807643,1807837,1807941,1807943
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1735801,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1779069,1779074,1780290,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1797823,1799068,1800495,1
803414,1805563,1806088,1806292,1806303-1806305,1806309,1806319,1806344,1806349-1806350,1806577,1806581,1806719,1807643,1807837,1807941,1807943,1808789
Propchange: axis/axis2/java/core/branches/1_7/modules/adb-codegen/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 18 23:18:12 2017
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6/modules/adb-codegen:1295540
/axis/axis2/java/core/branches/AXIOM-420/modules/adb-codegen:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318/modules/adb-codegen:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk/modules/adb-codegen:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1780290,1787632,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793405
+/axis/axis2/java/core/trunk/modules/adb-codegen:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1780290,1787632,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793405,1808789
Modified:
axis/axis2/java/core/branches/1_7/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl?rev=1808790&r1=1808789&r2=1808790&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
(original)
+++
axis/axis2/java/core/branches/1_7/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
Mon Sep 18 23:18:12 2017
@@ -2163,7 +2163,6 @@
<xsl:variable name="particleClassType"
select="@particleClassType"></xsl:variable>
<xsl:variable name="propQName">new
javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>","<xsl:value-of
select="$propertyName"/>")</xsl:variable>
- <xsl:variable name="propQName2">new
javax.xml.namespace.QName("","<xsl:value-of
select="$propertyName"/>")</xsl:variable>
<xsl:choose>
<xsl:when test="$unordered and not($choice and
$hasParticleType)"> <!-- One property per iteration if unordered -->
@@ -2188,7 +2187,7 @@
we have to sollow an excpetions :
todo find a better solsution-->
try{
</xsl:if>
- if (reader.isStartElement() <xsl:if
test="$simple"> || reader.hasText()</xsl:if> <xsl:if test="not($simple) and
not($particleClassType)">&& <xsl:value-of
select="$propQName"/>.equals(reader.getName()) || <xsl:value-of
select="$propQName2"/>.equals(reader.getName()) </xsl:if>){
+ if (reader.isStartElement() <xsl:if
test="$simple"> || reader.hasText()</xsl:if> <xsl:if test="not($simple) and
not($particleClassType)">&& <xsl:value-of
select="$propQName"/>.equals(reader.getName())</xsl:if>){
</xsl:otherwise>
</xsl:choose>
Modified: axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml?rev=1808790&r1=1808789&r2=1808790&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml Mon Sep 18
23:18:12 2017
@@ -207,6 +207,26 @@
<outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5809</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>wsdl2code-axis2-5887</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>wsdl2code</goal>
+ </goals>
+ <configuration>
+ <wsdlFile>src/test/wsdl/AXIS2-5887.wsdl</wsdlFile>
+ <syncMode>sync</syncMode>
+ <unpackClasses>true</unpackClasses>
+ <namespaceURIs>
+ <namespaceURI>
+
<uri>webservice/xtc/plugins/Speed4Trade/com</uri>
+
<packageName>org.apache.axis2.databinding.axis2_5887.client</packageName>
+ </namespaceURI>
+ </namespaceURIs>
+
<packageName>org.apache.axis2.databinding.axis2_5887.client</packageName>
+
<outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5887</outputDirectory>
+ </configuration>
+ </execution>
</executions>
<configuration>
<databindingName>adb</databindingName>
@@ -377,6 +397,7 @@
<source>${project.build.directory}/wsdl2code/AXIS2-5758/src</source>
<source>${project.build.directory}/wsdl2code/AXIS2-5799/src</source>
<source>${project.build.directory}/wsdl2code/AXIS2-5809/src</source>
+
<source>${project.build.directory}/wsdl2code/AXIS2-5887/src</source>
</sources>
</configuration>
</execution>
