Author: veithen
Date: Mon May 1 11:31:09 2017
New Revision: 1793309
URL: http://svn.apache.org/viewvc?rev=1793309&view=rev
Log:
AXIS2-5785: Move the ADB tests relying on XSD2Java to adb-tests, so that we
later replace the maven-antrun-plugin execution by axis2-xsd2java-maven-plugin.
Added:
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/helper/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/helper/org/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/helper/org/apache/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/helper/org/apache/axis2/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/helper/org/apache/axis2/schema/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/helper/org/apache/axis2/schema/testsuite/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/helper/org/apache/axis2/schema/testsuite/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/ADBBeanUtil.java
- copied unchanged from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/ADBBeanUtil.java
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/AbstractTestCase.java
- copied unchanged from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/all/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/all/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/anytype/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/anytype/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/attribute/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/attribute/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/base64binary/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/base64binary/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/booleantest/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/chameleon/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/chameleon/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/choice/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/choice/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/decimal/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/decimal/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/defaultnamespaces/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/defaultvalue/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/defaultvalue/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/enumeration/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/enumeration/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/extension/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/fix/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/fix/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/group/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/group/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/innerchoice/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerchoice/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/innerparticleextension/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerparticleextension/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/innerparticles/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/list/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/list/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/nonamespace/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/nonamespace/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/particlemaxoccurs/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/populate/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/populate/Util.java
- copied unchanged from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/populate/Util.java
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/populate/derived/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/populate/derived/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/populate/other/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/populate/other/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/populate/simple/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/populate/simple/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/references/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/references/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/restriction/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/restriction/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/testsuite/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/union/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/union/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/union2/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/union2/
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/unqualified/
- copied from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/unqualified/
axis/axis2/java/core/trunk/modules/adb-tests/sub-build.xml
- copied unchanged from r1793308,
axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml
Removed:
axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml
axis/axis2/java/core/trunk/modules/adb-codegen/test/helper/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/ADBBeanUtil.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/all/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/anytype/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/attribute/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/base64binary/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/chameleon/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/choice/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/decimal/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/defaultvalue/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/enumeration/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/fix/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/group/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerchoice/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerparticleextension/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/list/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/nonamespace/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/populate/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/references/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/restriction/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/union/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/union2/
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/unqualified/
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml
axis/axis2/java/core/trunk/modules/adb-tests/pom.xml
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml?rev=1793309&r1=1793308&r2=1793309&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml Mon May 1 11:31:09
2017
@@ -116,21 +116,11 @@
<configuration>
<excludes>
<exclude>org/apache/axis2/schema/ExtensionUtilityTest.java</exclude>
-
<exclude>org/apache/axis2/schema/innerparticleextension/TestInnerParticleExtension.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <testExcludes>
-
<exclude>helper/org/apache/axis2/schema/testsuite/TestAnyType*Helper.java</exclude>
- </testExcludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -154,47 +144,6 @@
<goal>run</goal>
</goals>
</execution>
- <execution>
- <id>generate-test-sources</id>
- <phase>generate-test-sources</phase>
- <configuration>
- <tasks unless="maven.test.skip">
- <property name="maven.junit.jvmargs" value=""
/>
- <path id="maven.dependency.classpath">
- <path refid="maven.compile.classpath" />
- </path>
- <property name="compiled.classes.dir"
value="target/classes" />
- <!-- Theres got to be a better way to do this
-->
- <property name="schema.source.dir"
value="test-resources/xsd" />
- <property name="testsuite.source.dir"
value="test-resources/testsuite" />
- <property name="schema.output.base.dir"
value="target/schema" />
- <property name="schema.generated.src.dir"
value="${schema.output.base.dir}/src" />
- <property name="schema.generated.classes.dir"
value="${schema.output.base.dir}/classes" />
- <ant antfile="sub-build.xml" inheritall="true"
inheritrefs="true" dir="." target="main" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-test-source</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/schema/src</source>
- </sources>
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
Modified: axis/axis2/java/core/trunk/modules/adb-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-tests/pom.xml?rev=1793309&r1=1793308&r2=1793309&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-tests/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb-tests/pom.xml Mon May 1 11:31:09
2017
@@ -43,6 +43,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <!-- TODO: remove this when we switch to the axis2-xsd2java-maven
plugin -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-adb-codegen</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>axis2-transport-local</artifactId>
<version>${project.version}</version>
@@ -60,6 +67,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>testutils</artifactId>
<scope>test</scope>
@@ -79,6 +91,53 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <configuration>
+ <tasks unless="maven.test.skip">
+ <property name="maven.junit.jvmargs" value=""
/>
+ <path id="maven.dependency.classpath">
+ <path refid="maven.test.classpath" />
+ </path>
+ <property name="compiled.classes.dir"
value="target/classes" />
+ <!-- Theres got to be a better way to do this
-->
+ <property name="schema.source.dir"
value="../adb-codegen/test-resources/xsd" />
+ <property name="testsuite.source.dir"
value="../adb-codegen/test-resources/testsuite" />
+ <property name="schema.output.base.dir"
value="target/schema" />
+ <property name="schema.generated.src.dir"
value="${schema.output.base.dir}/src" />
+ <property name="schema.generated.classes.dir"
value="${schema.output.base.dir}/classes" />
+ <ant antfile="sub-build.xml" inheritall="true"
inheritrefs="true" dir="." target="main" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/target/schema/src</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>${project.groupId}</groupId>
<artifactId>axis2-wsdl2code-maven-plugin</artifactId>
<version>${project.version}</version>
@@ -352,6 +411,24 @@
</dependencies>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <testExcludes>
+
<exclude>helper/org/apache/axis2/schema/testsuite/TestAnyType*Helper.java</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <excludes>
+
<exclude>org/apache/axis2/schema/innerparticleextension/TestInnerParticleExtension.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
