[richfaces-svn-commits] JBoss Rich Faces SVN: r19055 - in modules/tests/metamer/trunk: application and 1 other directories.

Author: lfryc(a)redhat.com Date: 2010-09-01 04:11:47 -0400 (Wed, 01 Sep 2010) New Revision: 19055 Modified: modules/tests/metamer/trunk/application/pom.xml modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml modules/tests/metamer/trunk/build.sh modules/tests/metamer/trunk/pom.xml Log: configured project to deploy metamer application in 3 profiles - jee6, mojarra and myfaces (RFPL-714, RFPL-774) Modified: modules/tests/metamer/trunk/application/pom.xml =================================================================== --- modules/tests/metamer/trunk/application/pom.xml 2010-08-31 18:46:44 UTC (rev 19054) +++ modules/tests/metamer/trunk/application/pom.xml 2010-09-01 08:11:47 UTC (rev 19055) @@ -119,12 +119,78 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> <configuration> - <attachClasses>true</attachClasses> + <classifier>jee6</classifier> + <packagingExcludes>WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/myfaces-api-*,WEB-INF/lib/myfaces-impl-*</packagingExcludes> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + </manifest> + <manifestEntries> + <SCM-Revision>${buildNumber}</SCM-Revision> + <SCM-Timestamp>${timestamp}</SCM-Timestamp> + </manifestEntries> + </archive> </configuration> + <executions> + <execution> + <id>sources-classes</id> + <phase>package</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <attachClasses>true</attachClasses> + <attachSources>true</attachSources> + </configuration> + </execution> + </executions> </plugin> <plugin> + <groupId>com.google.code.maven-replacer-plugin</groupId> + <artifactId>maven-replacer-plugin</artifactId> + <version>1.3.2</version> + <executions> + <execution> + <phase>pre-integration-test</phase> + <goals> + <goal>replace</goal> + </goals> + <configuration> + <file>target/${project.build.finalName}/WEB-INF/web.xml</file> + <regex>true</regex> + <regexFlags> + <regexFlag>MULTILINE</regexFlag> + </regexFlags> + <token>&lt;param-name&gt;org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL&lt;/param-name&gt;\s*&lt;param-value&gt;false&lt;/param-value&gt;</token> + <value>&lt;param-name&gt;org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL&lt;/param-name&gt;&lt;param-value&gt;true&lt;/param-value&gt;</value> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <executions> + <execution> + <phase>initialize</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <fileset> + <directory>target/${project.build.finalName}/WEB-INF</directory> + <includes> + <include>web.xml</include> + </includes> + </fileset> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>maven-jetty-plugin</artifactId> <configuration> @@ -155,121 +221,47 @@ <timestampFormat>{0,date,MMM dd, yyyy H:mm:ss zzz}</timestampFormat> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <attachClasses>true</attachClasses> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - </manifest> - <manifestEntries> - <SCM-Revision>${buildNumber}</SCM-Revision> - <SCM-Timestamp>${timestamp}</SCM-Timestamp> - </manifestEntries> - </archive> - </configuration> - </plugin> </plugins> </build> <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <executions> - <execution> - <id>jee6</id> - <phase>package</phase> - <goals> - <goal>war</goal> - </goals> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> - <classifier>jee6</classifier> - <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</packagingExcludes> - <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</warSourceExcludes> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>group-sources</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <finalName>sources</finalName> - <descriptor>assembler.xml</descriptor> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - <phase>package</phase> - <configuration> - <classesDirectory>${basedir}/target/sources/sources</classesDirectory> - <classifier>sources</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jee6</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6 - </webappDirectory> - </configuration> - </plugin> - </plugins> - </build> - + <profile> + <id>mojarra</id> + <activation> + <property> + <name>!jsf_profile</name> + </property> + </activation> <dependencies> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> - <scope>provided</scope> </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>myfaces</id> + <phase>integration-test</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <classifier>mojarra</classifier> + <packagingExcludes>WEB-INF/lib/myfaces-api-*,WEB-INF/lib/myfaces-impl-*</packagingExcludes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </profile> <profile> <id>myfaces</id> @@ -279,30 +271,36 @@ <value>myfaces</value> </property> </activation> + <dependencies> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-impl</artifactId> + </dependency> + </dependencies> <build> <plugins> <plugin> <artifactId>maven-war-plugin</artifactId> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-myfaces</webappDirectory> - </configuration> + <executions> + <execution> + <id>mojarra</id> + <phase>integration-test</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <classifier>myfaces</classifier> + <packagingExcludes>WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*</packagingExcludes> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> - - <dependencies> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> </profile> </profiles> </project> Modified: modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml 2010-08-31 18:46:44 UTC (rev 19054) +++ modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml 2010-09-01 08:11:47 UTC (rev 19055) @@ -13,6 +13,10 @@ <param-value>server</param-value> </context-param> <context-param> + <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name> + <param-value>false</param-value> + </context-param> + <context-param> <param-name>org.richfaces.skin</param-name> <param-value>#{richBean.skin}</param-value> </context-param> Modified: modules/tests/metamer/trunk/build.sh =================================================================== --- modules/tests/metamer/trunk/build.sh 2010-08-31 18:46:44 UTC (rev 19054) +++ modules/tests/metamer/trunk/build.sh 2010-09-01 08:11:47 UTC (rev 19055) @@ -1,2 +1,2 @@ #!/bin/bash -mvn clean install -Dselenium.server.skip=true -Dselenium.test.skip=true $* +mvn clean install -Pmyfaces -Dselenium.server.skip=true -Dselenium.test.skip=true $* Modified: modules/tests/metamer/trunk/pom.xml =================================================================== --- modules/tests/metamer/trunk/pom.xml 2010-08-31 18:46:44 UTC (rev 19054) +++ modules/tests/metamer/trunk/pom.xml 2010-09-01 08:11:47 UTC (rev 19055) @@ -151,7 +151,7 @@ <plugin> <artifactId>maven-release-plugin</artifactId> <configuration> - <arguments>-Dselenium.test.skip=true -Dselenium.server.skip=true</arguments> + <arguments>-Pmyfaces -Dselenium.test.skip=true -Dselenium.server.skip=true</arguments> <tagBase>https://svn.jboss.org/repos/richfaces/modules/tests/metamer/ta... <branchBase>https://svn.jboss.org/repos/richfaces/modules/tests/metamer... </configuration>