Author: veithen
Date: Thu Apr 14 22:02:44 2016
New Revision: 1739202
URL: http://svn.apache.org/viewvc?rev=1739202&view=rev
Log:
AXIS2-5758: Merge r1739186 to the 1.7 branch.
Added:
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/
- copied from r1739186,
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/wsdl/AXIS2-5758.wsdl
- copied unchanged from r1739186,
axis/axis2/java/core/trunk/modules/adb-tests/src/test/wsdl/AXIS2-5758.wsdl
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
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 Thu Apr 14 22:02:44 2016
@@ -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,1736512,1736543,1737030,1737567,1739001
+/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,1736512,1736543,1737030,1737567,1739001,1739186
Modified:
axis/axis2/java/core/branches/1_7/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=1739202&r1=1739201&r2=1739202&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Thu Apr 14 22:02:44 2016
@@ -858,7 +858,7 @@ public class SchemaCompiler {
if (isOuter) {
this.nillableElementList.add(xsElt.getQName());
} else {
- localNillableList.add(xsElt.getQName());
+ localNillableList.add(xsElt.getWireName());
}
}
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=1739202&r1=1739201&r2=1739202&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 Thu Apr 14
22:02:44 2016
@@ -138,6 +138,26 @@
<outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5750</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>wsdl2code-axis2-5758</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>wsdl2code</goal>
+ </goals>
+ <configuration>
+ <wsdlFile>src/test/wsdl/AXIS2-5758.wsdl</wsdlFile>
+ <syncMode>sync</syncMode>
+ <unpackClasses>true</unpackClasses>
+ <namespaceURIs>
+ <namespaceURI>
+
<uri>http://example.com/stockquote.xsd</uri>
+
<packageName>org.apache.axis2.databinding.axis2_5758.client</packageName>
+ </namespaceURI>
+ </namespaceURIs>
+
<packageName>org.apache.axis2.databinding.axis2_5758.client</packageName>
+
<outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5758</outputDirectory>
+ </configuration>
+ </execution>
</executions>
<configuration>
<databindingName>adb</databindingName>
@@ -229,6 +249,18 @@
<packageName>org.apache.axis2.databinding.axis2_5750.service</packageName>
</configuration>
</execution>
+ <execution>
+ <id>wsimport-axis2-5758</id>
+ <goals>
+ <goal>wsimport-test</goal>
+ </goals>
+ <configuration>
+ <wsdlFiles>
+
<wsdlFile>${basedir}/src/test/wsdl/AXIS2-5758.wsdl</wsdlFile>
+ </wsdlFiles>
+
<packageName>org.apache.axis2.databinding.axis2_5758.service</packageName>
+ </configuration>
+ </execution>
</executions>
<dependencies>
<dependency>
@@ -253,6 +285,7 @@
<source>${project.build.directory}/wsdl2code/AXIS2-5741/src</source>
<source>${project.build.directory}/wsdl2code/AXIS2-5749/src</source>
<source>${project.build.directory}/wsdl2code/AXIS2-5750/src</source>
+
<source>${project.build.directory}/wsdl2code/AXIS2-5758/src</source>
</sources>
</configuration>
</execution>
