Author: lfryc(a)redhat.com Date: 2010-03-03 02:36:05 -0500 (Wed, 03 Mar 2010) New Revision: 16519 Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml branches/community/3.3.X/samples/richfaces-demo/functional-test/profiles.jboss-qa.xml Log: RFPL-426 rf-demo ftest - pom.xml: jboss6x enabled configuration Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2010-03-03 07:32:38 UTC (rev 16518) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2010-03-03 07:36:05 UTC (rev 16519) @@ -426,6 +426,61 @@ </plugins> </build> </profile> + <!-- Container: JBoss AS 6.X --> + <profile> + <id>container-jboss6x</id> + <activation> + <property> + <name>containerId</name> + <value>jboss6x</value> + </property> + </activation> + <properties> + <container.home>${project.build.directory}/installs/jboss-${container.version}/${container.unflatted.dir}</container.home> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>1.0.1-alpha-2</version> + <executions> + <execution> + <id>undeploy-container</id> + <phase>post-integration-test</phase> + <goals> + <goal>undeploy</goal> + </goals> + </execution> + </executions> + <configuration> + <configuration> + <home>${container.home}/server/default</home> + <type>existing</type> + <properties> + <cargo.jboss.configuration>default</cargo.jboss.configuration> + <cargo.rmi.port>1099</cargo.rmi.port> + </properties> + </configuration> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>container-jboss6x-installation</id> + <activation> + <property> + <name>containerId</name> + <value>jboss6x</value> + </property> + </activation> + <properties> + <container.version>6.0.0.M2</container.version> + <container.unflatted.dir>jboss-6.0.0.20100216-M2</container.unflatted.dir> + <container.installer.url>http://downloads.sourceforge.net/project/jboss... + </properties> + </profile> <!-- Container: JBoss AS 5.X --> <profile> <id>container-jboss5x</id> Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/profiles.jboss-qa.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/profiles.jboss-qa.xml 2010-03-03 07:32:38 UTC (rev 16518) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/profiles.jboss-qa.xml 2010-03-03 07:36:05 UTC (rev 16519) @@ -121,6 +121,10 @@ <jboss5x.version>5.1.0.GA</jboss5x.version> <jboss5x.installer.url.unix>file:/qa/tools/src/jboss/jboss-5.1.0.GA.zip</jboss5x.installer.url.unix> <jboss5x.installer.url.windows>file:t:\src\jboss\jboss-5.1.0.GA.zip</jboss5x.installer.url.windows> + <jboss6x.version>6.0.0.M2</jboss6x.version> + <jboss6x.unflatted.dir>jboss-6.0.0.M2</jboss6x.unflatted.dir> + <jboss6x.installer.url.unix>file:/qa/tools/src/jboss/jboss-6.0.0.M2.zip</jboss6x.installer.url.unix> + <jboss6x.installer.url.windows>file:t:\src\jboss\jboss-6.0.0.M2.zip</jboss6x.installer.url.windows> <tomcat6x.version>6.0.18</tomcat6x.version> <tomcat6x.installer.url.unix>file:/qa/tools/src/apache/apache-tomcat-6.0.18.zip</tomcat6x.installer.url.unix> <tomcat6x.installer.url.windows>file:t:\src\apache\apache-tomcat-6.0.18.zip</tomcat6x.installer.url.windows> @@ -168,6 +172,21 @@ </properties> </profile> <profile> + <id>container-jboss6x-installation</id> + <activation> + <property> + <name>containerId</name> + <value>jboss6x</value> + </property> + </activation> + <properties> + <container.version>${jboss6x.version}</container.version> + <container.unflatted.dir>${jboss6x.unflatted.dir}</container.unflatted.dir> + <container.installer.url.unix>${jboss6x.installer.url.unix}</container.installer.url.unix> + <container.installer.url.windows>${jboss6x.installer.url.windows}</container.installer.url.windows> + </properties> + </profile> + <profile> <id>container-installation-unix</id> <activation> <os>