Author: alessio.soldano(a)jboss.com Date: 2011-02-11 12:12:26 -0500 (Fri, 11 Feb 2011) New Revision: 13735 Removed: stack/cxf/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml Modified: stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml Log: [JBWS-3210] Removing hack introduced in r13718 (depending on org.jboss.ws.cxf:jbossws-cxf-factories:4.0.0.Alpha1): moved jbossws testsuites execution to maven integration-test phase (which is fine even regardless of this issue) to allow for having packaged jbossws-cxf artifacts available; added plugin for copying jbossws-cxf-factories to the temporary endorsed dir that's used when running the testsuite against AS7. Also replaced the use of an assembly plugin for making the junit jar available to WSRunClientTestCase with an additional execution of dependency plugin in pre-integration-test phase. Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-11 16:12:41 UTC (rev 13734) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-11 17:12:26 UTC (rev 13735) @@ -57,7 +57,7 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-factories</artifactId> - <version>4.0.0.Alpha1</version><!-- TODO: think out how to remove this temporary hack --> + <version>${project.version}</version> </dependency> <dependency> <groupId>junit</groupId> @@ -159,17 +159,34 @@ <type>jar</type> <outputDirectory>${project.build.directory}/endorsed</outputDirectory> </artifactItem> - <artifactItem> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-factories</artifactId> - <type>jar</type> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> + <plugin> <!-- This copies jbossws-cxf-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-cxf-factories-${project.version}.jar</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> @@ -191,86 +208,99 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <skip>true</skip> <failIfNoTests>false</failIfNoTests> - <includes> - <include>**/*Test.java</include> - <include>**/*TestCase.java</include> - </includes> - <systemProperties> - <property> - <name>jboss.server.instance</name> - <value>${jboss.server.instance}</value> - </property> - <property> - <name>jboss.bind.address</name> - <value>${jboss.bind.address}</value> - </property> - <property> - <name>java.naming.provider.url</name> - <value>jnp://${jboss.bind.address}:1099</value> - </property> - <property> - <name>java.protocol.handler.pkgs</name> - <value>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</value> - </property> - <property> - <name>jboss.home</name> - <value>${jboss.home}</value> - </property> - <property> - <name>jbossws.integration.target</name> - <value>${jbossws.integration.target}</value> - </property> - <property> - <name>test.disable.deployment</name> - <value>false</value> - </property> - <property> - <name>log4j.output.dir</name> - <value>${project.build.directory}</value> - </property> - <property> - <name>org.jboss.ws.wsse.keyStore</name> - <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.keystore</value> - </property> - <property> - <name>org.jboss.ws.wsse.trustStore</name> - <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.truststore</value> - </property> - <property> - <name>org.jboss.ws.wsse.keyStorePassword</name> - <value>jbossws</value> - </property> - <property> - <name>org.jboss.ws.wsse.trustStorePassword</name> - <value>jbossws</value> - </property> - <property> - <name>org.jboss.ws.wsse.keyStoreType</name> - <value>jks</value> - </property> - <property> - <name>org.jboss.ws.wsse.trustStoreType</name> - <value>jks</value> - </property> - <property> - <name>test.archive.directory</name> - <value>${test.archive.directory}</value> - </property> - <property> - <name>test.classes.directory</name> - <value>${test.classes.directory}</value> - </property> - <property> - <name>test.resources.directory</name> - <value>${test.resources.directory}</value> - </property> - <property> - <name>wsdl.publish.location</name> - <value>${wsdl.publish.location}</value> - </property> - </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.server.instance</name> + <value>${jboss.server.instance}</value> + </property> + <property> + <name>jboss.bind.address</name> + <value>${jboss.bind.address}</value> + </property> + <property> + <name>java.naming.provider.url</name> + <value>jnp://${jboss.bind.address}:1099</value> + </property> + <property> + <name>java.protocol.handler.pkgs</name> + <value>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</value> + </property> + <property> + <name>jboss.home</name> + <value>${jboss.home}</value> + </property> + <property> + <name>jbossws.integration.target</name> + <value>${jbossws.integration.target}</value> + </property> + <property> + <name>test.disable.deployment</name> + <value>false</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${project.build.directory}</value> + </property> + <property> + <name>org.jboss.ws.wsse.keyStore</name> + <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.keystore</value> + </property> + <property> + <name>org.jboss.ws.wsse.trustStore</name> + <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.truststore</value> + </property> + <property> + <name>org.jboss.ws.wsse.keyStorePassword</name> + <value>jbossws</value> + </property> + <property> + <name>org.jboss.ws.wsse.trustStorePassword</name> + <value>jbossws</value> + </property> + <property> + <name>org.jboss.ws.wsse.keyStoreType</name> + <value>jks</value> + </property> + <property> + <name>org.jboss.ws.wsse.trustStoreType</name> + <value>jks</value> + </property> + <property> + <name>test.archive.directory</name> + <value>${test.archive.directory}</value> + </property> + <property> + <name>test.classes.directory</name> + <value>${test.classes.directory}</value> + </property> + <property> + <name>test.resources.directory</name> + <value>${test.resources.directory}</value> + </property> + <property> + <name>wsdl.publish.location</name> + <value>${wsdl.publish.location}</value> + </property> + </systemProperties> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2011-02-11 16:12:41 UTC (rev 13734) +++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2011-02-11 17:12:26 UTC (rev 13735) @@ -21,6 +21,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 --> @@ -81,6 +87,24 @@ </artifactItems> </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> @@ -128,26 +152,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/cxf/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml 2011-02-11 16:12:41 UTC (rev 13734) +++ stack/cxf/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml 2011-02-11 17:12:26 UTC (rev 13735) @@ -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>