Author: veithen
Date: Sun Mar 14 21:29:56 2010
New Revision: 922967
URL: http://svn.apache.org/viewvc?rev=922967&view=rev
Log:
Integration tests: let Maven invoke the compiler (instead of using Ant). This
allows maven-eclipse-plugin to import the generated sources into the Eclipse
project.
Modified:
axis/axis2/java/core/trunk/modules/integration/itest-build.xml
axis/axis2/java/core/trunk/modules/integration/pom.xml
Modified: axis/axis2/java/core/trunk/modules/integration/itest-build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/itest-build.xml?rev=922967&r1=922966&r2=922967&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/itest-build.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/itest-build.xml Sun Mar 14
21:29:56 2010
@@ -47,11 +47,6 @@
<classpath location="${compiled.classes.dir}" />
<arg line="-ap -o target/wsdl/complexdatatype -s -u -uw
-uri test-resources/ComplexDataTypes/ComplexDataTypes.wsdl" />
</java>
- <javac fork="true" destdir="target/classes" debug="on">
- <classpath refid="maven.runtime.classpath" />
- <classpath location="${compiled.classes.dir}" />
- <src path="target/wsdl/complexdatatype" />
- </javac>
<echo>Compiling DocumentUnwrappingTest.wsdl</echo>
<mkdir dir="${wsdl.output.base.dir}/documentunwrapping" />
@@ -81,16 +76,11 @@
<arg line="-o target/wsdl/complexdatatypebare -s -uri
test-resources/ComplexDataTypesDocLitBare/ComplexDataTypesDocLitBare.wsdl" />
</java>
<ant antfile="build.xml" inheritall="true" inheritrefs="true"
dir="target/wsdl/complexdatatypebare" />
- <copy toDir="target/classes" failonerror="false">
- <fileset
dir="target/wsdl/complexdatatypebare/build/classes">
- <include name="**/*.class" />
- </fileset>
- </copy>
<!-- compile the schema for XMLbeans -->
<java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler"
fork="true">
<classpath refid="maven.runtime.classpath" />
- <arg line="-src target/xmlbeans-src -d target/classes
test-resources/xsd/type-test.xsd" />
+ <arg line="-src target/xmlbeans/java -d
target/xmlbeans/resources -srconly test-resources/xsd/type-test.xsd" />
</java>
<ant antfile="itest-build.xml" inheritall="true"
inheritrefs="true" dir="." target="rpc-wsdl-codegen" />
Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=922967&r1=922966&r2=922967&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Sun Mar 14 21:29:56
2010
@@ -303,6 +303,9 @@
<include>**/*.properties</include>
</includes>
</testResource>
+ <testResource>
+
<directory>${project.build.directory}/xmlbeans/resources</directory>
+ </testResource>
</testResources>
<plugins>
<plugin>
@@ -365,6 +368,26 @@
</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>${project.build.directory}/wsdl/complexdatatype/src</source>
+
<source>${project.build.directory}/wsdl/complexdatatypebare/src</source>
+
<source>${project.build.directory}/xmlbeans/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<reporting>
