Author: veithen
Date: Mon May 1 11:52:34 2017
New Revision: 1793312
URL: http://svn.apache.org/viewvc?rev=1793312&view=rev
Log:
Replace one invocation of XSD2Java by axis2-xsd2java-maven-plugin.
Modified:
axis/axis2/java/core/branches/AXIS2-5785/modules/adb-tests/pom.xml
axis/axis2/java/core/branches/AXIS2-5785/modules/adb-tests/sub-build.xml
Modified: axis/axis2/java/core/branches/AXIS2-5785/modules/adb-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-5785/modules/adb-tests/pom.xml?rev=1793312&r1=1793311&r2=1793312&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-5785/modules/adb-tests/pom.xml
(original)
+++ axis/axis2/java/core/branches/AXIS2-5785/modules/adb-tests/pom.xml Mon May
1 11:52:34 2017
@@ -91,6 +91,67 @@
<build>
<plugins>
<plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-xsd2java-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>xsd2java</goal>
+ </goals>
+ <configuration>
+
<outputFolder>${project.build.directory}/schema/src</outputFolder>
+ <xsdFiles>
+
<xsdFile>../adb-codegen/test-resources/xsd/simple_maxOccurs2.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/xsd/anonymous_complexType.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/xsd/simple_choice.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/xsd/simple_particle_all.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/xsd/simple_maxOccurs.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/xsd/simple_anytype.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/xsd/simple-minoccurs0.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/xsd/complex-minoccurs0.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/xsd/simple-recursive-datatypes.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/xsd/mixed_minoccus0.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/xsd/simple/simpleType-All.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/xsd/derived/derivedType-All.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/testsuite.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/extensions.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/union.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/all.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/enumeration.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/restrictions.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/choice.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/list.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/references.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/innerchoice.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/attribute.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/boolean.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/particlemaxoccurs.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/innerParticles.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/default_namespaces.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/groups.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/base64binary.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/abstract.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/decimal.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/anytype.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/innerParticleExtension.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/union2.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/default_value.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/complexExtension.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/chameleon.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/nonamespace.xsd</xsdFile> <!--
compile only; no tests -->
+
<xsdFile>../adb-codegen/test-resources/testsuite/unqualified.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/unqualified/companyservice.xsd</xsdFile>
+
<xsdFile>../adb-codegen/test-resources/testsuite/names.xsd</xsdFile> <!--
compile only; no tests -->
+
<xsdFile>../adb-codegen/test-resources/testsuite/std-schemas.xsd</xsdFile> <!--
compile only; no tests -->
+
<xsdFile>../adb-codegen/test-resources/xsd/fixed_value.xsd</xsdFile>
+ </xsdFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
Modified:
axis/axis2/java/core/branches/AXIS2-5785/modules/adb-tests/sub-build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-5785/modules/adb-tests/sub-build.xml?rev=1793312&r1=1793311&r2=1793312&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-5785/modules/adb-tests/sub-build.xml
(original)
+++ axis/axis2/java/core/branches/AXIS2-5785/modules/adb-tests/sub-build.xml
Mon May 1 11:52:34 2017
@@ -42,55 +42,6 @@
<jvmarg line="${maven.junit.jvmargs}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_maxOccurs2.xsd"/>
- <arg
file="${schema.source.dir}/anonymous_complexType.xsd"/>
- <arg file="${schema.source.dir}/simple_choice.xsd"/>
- <arg
file="${schema.source.dir}/simple_particle_all.xsd"/>
- <arg file="${schema.source.dir}/simple_maxOccurs.xsd"/>
- <arg file="${schema.source.dir}/simple_anytype.xsd"/>
- <arg file="${schema.source.dir}/simple-minoccurs0.xsd"/>
- <arg
file="${schema.source.dir}/complex-minoccurs0.xsd"/>
- <arg
file="${schema.source.dir}/simple-recursive-datatypes.xsd"/>
- <arg file="${schema.source.dir}/mixed_minoccus0.xsd"/>
- <arg
file="${schema.source.dir}/simple/simpleType-All.xsd"/>
- <arg
file="${schema.source.dir}/derived/derivedType-All.xsd"/>
- <arg file="${testsuite.source.dir}/testsuite.xsd"/>
- <arg file="${testsuite.source.dir}/extensions.xsd"/>
- <arg file="${testsuite.source.dir}/union.xsd"/>
- <arg file="${testsuite.source.dir}/all.xsd"/>
- <arg file="${testsuite.source.dir}/enumeration.xsd"/>
- <arg file="${testsuite.source.dir}/restrictions.xsd"/>
- <arg file="${testsuite.source.dir}/choice.xsd"/>
- <arg file="${testsuite.source.dir}/list.xsd"/>
- <arg file="${testsuite.source.dir}/references.xsd"/>
- <arg file="${testsuite.source.dir}/innerchoice.xsd"/>
- <arg file="${testsuite.source.dir}/attribute.xsd"/>
- <arg file="${testsuite.source.dir}/boolean.xsd"/>
- <arg
file="${testsuite.source.dir}/particlemaxoccurs.xsd"/>
- <arg file="${testsuite.source.dir}/innerParticles.xsd"/>
- <arg
file="${testsuite.source.dir}/default_namespaces.xsd"/>
- <arg file="${testsuite.source.dir}/groups.xsd"/>
- <arg file="${testsuite.source.dir}/base64binary.xsd"/>
- <arg file="${testsuite.source.dir}/abstract.xsd"/>
- <arg file="${testsuite.source.dir}/decimal.xsd"/>
- <arg file="${testsuite.source.dir}/anytype.xsd"/>
- <arg
file="${testsuite.source.dir}/innerParticleExtension.xsd"/>
- <arg file="${testsuite.source.dir}/union2.xsd"/>
- <arg file="${testsuite.source.dir}/default_value.xsd"/>
- <arg
file="${testsuite.source.dir}/complexExtension.xsd"/>
- <arg file="${testsuite.source.dir}/chameleon.xsd"/>
- <arg file="${testsuite.source.dir}/nonamespace.xsd"/>
<!-- compile only; no tests -->
- <arg file="${testsuite.source.dir}/unqualified.xsd"/>
- <arg
file="${testsuite.source.dir}/unqualified/companyservice.xsd"/>
- <arg file="${testsuite.source.dir}/names.xsd"/> <!--
compile only; no tests -->
- <arg file="${testsuite.source.dir}/std-schemas.xsd"/>
<!-- compile only; no tests -->
- <arg file="${schema.source.dir}/fixed_value.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true"
failonerror="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
<arg value="-dp"/>
<arg value="org.apache.axis2.schema.nonamespace"/>
<arg value="-mp"/>
