Author: alessio.soldano(a)jboss.com Date: 2011-02-25 08:18:13 -0500 (Fri, 25 Feb 2011) New Revision: 13802 Removed: stack/native/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml Modified: stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/modules/testsuite/shared-tests/pom.xml Log: [JBWS-3210] Moving jbossws-native tests too to 'integration-test' maven phase Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-02-25 07:35:26 UTC (rev 13801) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-02-25 13:18:13 UTC (rev 13802) @@ -138,6 +138,29 @@ </testResource> </testResources> <plugins> + <plugin> <!-- This copies jbossws-native-factories jar to endorsed dir before the integration-tests are run --> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-factories-jar</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/endorsed</outputDirectory> + <resources> + <resource> + <directory>${basedir}/../endorsed/target/</directory> + <includes> + <include>jbossws-native-factories-${project.version}.jar</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> @@ -160,8 +183,23 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <skip>true</skip> <failIfNoTests>false</failIfNoTests> - <systemProperties> + </configuration> + <executions> + <execution> + <id>integration-tests</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <includes> + <include>**/*Test.java</include> + <include>**/*TestCase.java</include> + </includes> + <systemProperties> <property> <name>jboss.bind.address</name> <value>${jboss.bind.address}</value> @@ -240,6 +278,8 @@ </property> </systemProperties> </configuration> + </execution> + </executions> </plugin> </plugins> </build> Modified: stack/native/trunk/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/shared-tests/pom.xml 2011-02-25 07:35:26 UTC (rev 13801) +++ stack/native/trunk/modules/testsuite/shared-tests/pom.xml 2011-02-25 13:18:13 UTC (rev 13802) @@ -20,6 +20,12 @@ <artifactId>jbossws-shared-testsuite</artifactId> <type>zip</type> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> </dependencies> <!-- Plugins --> @@ -78,6 +84,24 @@ <outputDirectory>src/test</outputDirectory> </configuration> </execution> + <execution> <!-- This is used by WSRunClientTestCase --> + <id>copy-junit</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <type>jar</type> + <outputDirectory>${basedir}/target/junit-libs</outputDirectory> + <destFileName>junit.jar</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> </executions> </plugin> <plugin> @@ -125,26 +149,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>junit-libs</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>scripts/assembly-junit-artifacts.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>validate</phase> - <goals> - <goal>directory-inline</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </profile> Deleted: stack/native/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml =================================================================== --- stack/native/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml 2011-02-25 07:35:26 UTC (rev 13801) +++ stack/native/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml 2011-02-25 13:18:13 UTC (rev 13802) @@ -1,22 +0,0 @@ -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - - <id>junit-libs</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <dependencySets> - <dependencySet> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>test</scope> - <unpack>false</unpack> - <includes> - <include>*:junit:jar</include> - </includes> - </dependencySet> - </dependencySets> - -</assembly>