Author: jjamrich Date: 2012-03-27 09:23:44 -0400 (Tue, 27 Mar 2012) New Revision: 23206 Modified: branches/enterprise/3.3.1.SP3_RFPL-2088/samples/richfaces-demo/functional-test/pom.xml Log: RFPL-2088: Update cargo plugin to work with JBoss EAP6 Update cargo plugin version, some configuration options accrdingly, and update configuration for JBoss AS to 6.0.0.Final, as it is last stable version. Main change is profile for JBoss EAP6 (based on JBoss AS 7.1.x), since cargo plugin 1.2.0 support it. Verified that at least with EAP6 it is possible run whole surefire suite. Modified: branches/enterprise/3.3.1.SP3_RFPL-2088/samples/richfaces-demo/functional-test/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP3_RFPL-2088/samples/richfaces-demo/functional-test/pom.xml 2012-03-27 13:23:34 UTC (rev 23205) +++ branches/enterprise/3.3.1.SP3_RFPL-2088/samples/richfaces-demo/functional-test/pom.xml 2012-03-27 13:23:44 UTC (rev 23206) @@ -287,7 +287,7 @@ <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> - <version>1.0-beta-2</version> + <version>1.2.0</version> <executions> <execution> <id>install-container</id> @@ -299,9 +299,11 @@ <execution> <id>start-container</id> <phase>pre-integration-test</phase> - <goals> - <goal>deploy</goal> - <goal>start</goal> + <goals> + <goal>start</goal><!-- order is important to 'pingURL' working correctly. + Using 'pingURL' is necessary to avoid start run surefire before application is deployed. + Application deployment is not synchronized on JBoss AS 7.1.x --> + <goal>deploy</goal> </goals> </execution> <execution> @@ -319,7 +321,7 @@ <append>false</append> <zipUrlInstaller> <url>${container.installer.url}</url> - <installDir>${project.basedir}/target/installs</installDir> + <extractDir>${project.basedir}/target/installs</extractDir> </zipUrlInstaller> </container> <configuration> @@ -337,6 +339,8 @@ <properties> <context>${context.path}</context> </properties> + <pingURL>${context.root}${context.path}/welcome.jsf</pingURL> + <pingTimeout>60000</pingTimeout> </deployable> </deployables> </deployer> @@ -431,6 +435,63 @@ </plugins> </build> </profile> + <!-- Container: JBoss AS 7.1.X --> + <profile> + <id>container-jboss-eap6</id> + <activation> + <property> + <name>containerId</name> + <value>jboss71x</value> + </property> + </activation> + <properties> + <container.home>${project.build.directory}/installs/jboss-eap-${container.version}/${container.unflatted.dir}</container.home> + <container.configuration>standalone</container.configuration> + <container.configuration.home>${container.home}/${container.configuration}</container.configuration.home> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>1.2.0</version> + <executions> + <execution> + <id>undeploy-container</id> + <phase>post-integration-test</phase> + <goals> + <goal>undeploy</goal> + </goals> + </execution> + </executions> + <configuration> + <configuration> + <home>${container.configuration.home}</home> + <type>existing</type> + <properties> + <cargo.jboss.configuration>${container.configuration}</cargo.jboss.configuration> + <cargo.rmi.port>1099</cargo.rmi.port> + </properties> + </configuration> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>container-jboss-eap6-installation</id> + <activation> + <property> + <name>containerId</name> + <value>jboss71x</value> + </property> + </activation> + <properties> + <container.version>6.0.0.ER3</container.version> + <container.unflatted.dir>jboss-eap-6.0</container.unflatted.dir> + </properties> + </profile> + <!-- Container: JBoss AS 6.X --> <profile> <id>container-jboss6x</id> @@ -441,7 +502,7 @@ </property> </activation> <properties> - <container.home>${project.build.directory}/installs/jboss-${container.version}/${container.unflatted.dir}</container.home> + <container.home>${project.build.directory}/installs/jboss-as-distribution-${container.version}/${container.unflatted.dir}</container.home> <container.configuration>default</container.configuration> <container.configuration.home>${container.home}/server/${container.configuration}</container.configuration.home> </properties> @@ -450,7 +511,8 @@ <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> - <version>1.0.1-alpha-2</version> + <!-- version>1.0.1-alpha-2</version--> + <version>1.2.0</version> <executions> <execution> <id>undeploy-container</id> @@ -483,8 +545,8 @@ </property> </activation> <properties> - <container.version>6.0.0.M2</container.version> - <container.unflatted.dir>jboss-6.0.0.20100216-M2</container.unflatted.dir> + <container.version>6.0.0.Final</container.version> + <container.unflatted.dir>jboss-6.0.0.Final</container.unflatted.dir> <container.installer.url>http://downloads.sourceforge.net/project/jboss... </properties> </profile> @@ -656,4 +718,4 @@ <scope>test</scope> </dependency> </dependencies> -</project> +</project> \ No newline at end of file