Author: lfryc(a)redhat.com
Date: 2009-12-16 10:57:53 -0500 (Wed, 16 Dec 2009)
New Revision: 16155
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:
- rf-demo ftest - added omitted demo.artifactId.suffix to richfaces-demo dependency, added
property jsf2 to activate profiles "jsf2" and
"container-installation-jsf2"
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 2009-12-16
15:51:57 UTC (rev 16154)
+++ branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2009-12-16
15:57:53 UTC (rev 16155)
@@ -243,6 +243,11 @@
</profile>
<profile>
<id>jsf2_0</id>
+ <activation>
+ <property>
+ <name>jsf2</name>
+ </property>
+ </activation>
<properties>
<demo.artifactId.suffix>-jsf2</demo.artifactId.suffix>
</properties>
@@ -333,7 +338,7 @@
<artifactItems>
<artifactItem>
<groupId>org.richfaces.samples</groupId>
- <artifactId>richfaces-demo</artifactId>
+ <artifactId>richfaces-demo${demo.artifactId.suffix}</artifactId>
<version>${demo.version}</version>
<classifier>${demo.classifier}</classifier>
<type>war</type>
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 2009-12-16
15:51:57 UTC (rev 16154)
+++
branches/community/3.3.X/samples/richfaces-demo/functional-test/profiles.jboss-qa.xml 2009-12-16
15:57:53 UTC (rev 16155)
@@ -33,17 +33,6 @@
<demo.version>${profile.demo.version}</demo.version>
</properties>
</profile>
- <profile>
- <id>demo-found-in-workspace</id>
- <activation>
- <file>
- <exists>richfaces-demo.war</exists>
- </file>
- </activation>
- <properties>
- <demo.location>./richfaces-demo.war</demo.location>
- </properties>
- </profile>
<!-- INTERNET EXPLORER PROFILE -->
<profile>
<id>browser-internet-explorer</id>
@@ -139,6 +128,11 @@
</profile>
<profile>
<id>container-installation-jsf2</id>
+ <activation>
+ <property>
+ <name>jsf2</name>
+ </property>
+ </activation>
<properties>
<jboss5x.version>5.1.0.GA</jboss5x.version>
<jboss5x.installer.url.unix>file:/qa/home/hudson/lfryc/jboss-jsf2/jboss-5.1.0.GA.zip</jboss5x.installer.url.unix>