You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/03/16 23:49:46 UTC
svn commit: r1735335 - in /axis/axis2/java/core/branches/1_7: ./
modules/adb-codegen/src/org/apache/axis2/schema/ modules/adb-tests/
modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/
modules/adb-tests/src/test/wsdl/ modules/adb-t...
Author: veithen
Date: Wed Mar 16 22:49:45 2016
New Revision: 1735335
URL: http://svn.apache.org/viewvc?rev=1735335&view=rev
Log:
AXIS2-5749: Merge r1735331 to the 1.7 branch.
Added:
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/
- copied from r1735331, axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/wsdl/AXIS2-5749.wsdl
- copied unchanged from r1735331, axis/axis2/java/core/trunk/modules/adb-tests/src/test/wsdl/AXIS2-5749.wsdl
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/xslt/AXIS2-5749.xsl
- copied unchanged from r1735331, axis/axis2/java/core/trunk/modules/adb-tests/src/test/xslt/AXIS2-5749.xsl
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 Wed Mar 16 22:49:45 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
+/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
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=1735335&r1=1735334&r2=1735335&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 Wed Mar 16 22:49:45 2016
@@ -691,7 +691,7 @@ public class SchemaCompiler {
processedAnonymousComplexTypesMap.remove(xsElt);
String className = findClassName(schemaType.getQName(), isArray(xsElt));
innerElementMap.put(
- xsElt.getQName(),
+ xsElt.getWireName(),
className);
//store in the schema map
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=1735335&r1=1735334&r2=1735335&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 Wed Mar 16 22:49:45 2016
@@ -104,6 +104,20 @@
<outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5741</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>wsdl2code-axis2-5749</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>wsdl2code</goal>
+ </goals>
+ <configuration>
+ <wsdlFile>src/test/wsdl/AXIS2-5749.wsdl</wsdlFile>
+ <packageName>org.apache.axis2.databinding.axis2_5749.service</packageName>
+ <generateServerSide>true</generateServerSide>
+ <generateServicesXml>true</generateServicesXml>
+ <outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5749</outputDirectory>
+ </configuration>
+ </execution>
</executions>
<configuration>
<databindingName>adb</databindingName>
@@ -129,6 +143,14 @@
<stylesheet>src/test/xslt/AXIS2-5741.xsl</stylesheet>
<outputDir>${project.build.directory}/repo/AXIS2-5741/services/FiverxLinkService/META-INF</outputDir>
</transformationSet>
+ <transformationSet>
+ <dir>${project.build.directory}/wsdl2code/AXIS2-5749/resources</dir>
+ <includes>
+ <include>services.xml</include>
+ </includes>
+ <stylesheet>src/test/xslt/AXIS2-5749.xsl</stylesheet>
+ <outputDir>${project.build.directory}/repo/AXIS2-5749/services/ColorService/META-INF</outputDir>
+ </transformationSet>
</transformationSets>
</configuration>
</execution>
@@ -163,6 +185,18 @@
<packageName>org.apache.axis2.databinding.axis2_5741.client</packageName>
</configuration>
</execution>
+ <execution>
+ <id>wsimport-axis2-5749</id>
+ <goals>
+ <goal>wsimport-test</goal>
+ </goals>
+ <configuration>
+ <wsdlFiles>
+ <wsdlFile>${basedir}/src/test/wsdl/AXIS2-5749.wsdl</wsdlFile>
+ </wsdlFiles>
+ <packageName>org.apache.axis2.databinding.axis2_5749.client</packageName>
+ </configuration>
+ </execution>
</executions>
<dependencies>
<dependency>
@@ -185,6 +219,7 @@
<sources>
<source>${project.build.directory}/wsdl2code/mtom/src</source>
<source>${project.build.directory}/wsdl2code/AXIS2-5741/src</source>
+ <source>${project.build.directory}/wsdl2code/AXIS2-5749/src</source>
</sources>
</configuration>
</execution>