Author: thomas.diesler(a)jboss.com Date: 2008-05-08 02:51:01 -0400 (Thu, 08 May 2008) New Revision: 6954 Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/pom.xml Log: Move test preparation to profile 'noprepare' Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-07 20:39:26 UTC (rev 6953) +++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-08 06:51:01 UTC (rev 6954) @@ -32,61 +32,6 @@ </filesets> </configuration> </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <classifier>testsuite</classifier> - <type>zip</type> - </artifactItem> - </artifactItems> - <outputDirectory>src/test</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>wsconsume</id> - <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="maven.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> - </tasks> - </configuration> - </execution> - <execution> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> @@ -94,6 +39,78 @@ <profiles> <!-- + Name: noprepare + Descr: Skip test preparation with -Dnoprepare + --> + <profile> + <id>noprepare</id> + <activation> + <property> + <name>!noprepare</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <classifier>testsuite</classifier> + <type>zip</type> + </artifactItem> + </artifactItems> + <outputDirectory>src/test</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>wsconsume</id> + <phase>generate-sources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> + </tasks> + </configuration> + </execution> + <execution> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <!-- Name: jboss422 Descr: JBoss-4.2.2 specific options --> Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-07 20:39:26 UTC (rev 6953) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-08 06:51:01 UTC (rev 6954) @@ -24,83 +24,94 @@ </dependency> </dependencies> - <!-- Plugins --> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <!--execution> - <id>wsconsume</id> - <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="maven.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> - </tasks> - </configuration> - </execution> - <execution> - <id>wstools</id> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="maven.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="scripts/antrun-wstools.xml" target="wstools"/> - </tasks> - </configuration> - </execution> - <execution> - <id>wsprovide</id> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="maven.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/> - </tasks> - </configuration> - </execution--> - <execution> - <id>build-jars</id> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tests.output.dir" value="${project.build.directory}"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> - <ant antfile="src/scripts/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/> - <ant antfile="src/scripts/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> - <ant antfile="src/scripts/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="src/scripts/build-samples-jaxws.xml" target="build-samples-jaxws"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <!-- Profiles --> <profiles> <!-- + Name: noprepare + Descr: Skip test preparation with -Dnoprepare + --> + <profile> + <id>noprepare</id> + <activation> + <property> + <name>!noprepare</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>wsconsume</id> + <phase>generate-sources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> + </tasks> + </configuration> + </execution> + <execution> + <id>wstools</id> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="scripts/antrun-wstools.xml" target="wstools"/> + </tasks> + </configuration> + </execution> + <execution> + <id>wsprovide</id> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/> + </tasks> + </configuration> + </execution> + <execution> + <id>build-jars</id> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="tests.output.dir" value="${project.build.directory}"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <ant antfile="src/scripts/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/> + <ant antfile="src/scripts/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> + <ant antfile="src/scripts/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="src/scripts/build-samples-jaxws.xml" target="build-samples-jaxws"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <!-- Name: jboss422 Descr: JBoss-4.2.2 specific options -->