Author: jbalunas(a)redhat.com Date: 2010-08-25 15:58:58 -0400 (Wed, 25 Aug 2010) New Revision: 18975 Modified: trunk/examples/richfaces-showcase/pom.xml Log: Updated jee6 profile in showcase app, so default ee6 version runs on JBoss AS6 - RFPL-772 Modified: trunk/examples/richfaces-showcase/pom.xml =================================================================== --- trunk/examples/richfaces-showcase/pom.xml 2010-08-25 19:39:30 UTC (rev 18974) +++ trunk/examples/richfaces-showcase/pom.xml 2010-08-25 19:58:58 UTC (rev 18975) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project 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/maven-4.0.0.xsd"> +<project 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/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -17,45 +18,47 @@ <packaging>war</packaging> <name>Richfaces Examples: Richfaces Showcase Application</name> - <properties> - </properties> + <properties> + </properties> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-api</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-ui</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </dependency> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> </dependency> - <!-- simple logger binding: only messages of level INFO and higher - are printed --> + <!-- + simple logger binding: only messages of level INFO and + higher are printed + --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@ -87,7 +90,8 @@ <configuration> <scanIntervalSeconds>10</scanIntervalSeconds> <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <connector + implementation="org.mortbay.jetty.nio.SelectChannelConnector"> <port>${jetty.port}</port> <maxIdleTime>60000</maxIdleTime> </connector> @@ -126,13 +130,13 @@ <dependency> <groupId>org.glassfish.web</groupId> <artifactId>el-impl</artifactId> - <version>2.2</version> - </dependency> + <version>2.2</version> + </dependency> <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>2.2</version> - </dependency> + <version>2.2</version> + </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.1_spec</artifactId> @@ -277,8 +281,12 @@ <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-*,WEB-INF/lib/jstl-*</packagingExcludes> - <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</warSourceExcludes> + <!-- + For JBoss AS 6 integration there is a conflict with guava, and + google-collections. So excluding guava is required + --> + <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*,WEB-INF/lib/guava-*</packagingExcludes> + <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*,WEB-INF/lib/guava-*</warSourceExcludes> <webResources> <resource> <directory>${basedir}/src/main/java</directory> @@ -354,6 +362,21 @@ <dependencies> <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-api</artifactId> + <!-- + For JBoss AS 6 integration there is a conflict + with guava, and google-collections. So this is + required until this is resolved. + --> + <exclusions> + <exclusion> + <artifactId>guava</artifactId> + <groupId>com.google.guava</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> <scope>provided</scope>