Author: Alex.Kolonitsky Date: 2010-06-02 14:41:18 -0400 (Wed, 02 Jun 2010) New Revision: 17470 Modified: root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml root/examples/richfaces-showcase/trunk/pom.xml Log: correct archetype and showcase Modified: root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml =================================================================== --- root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml 2010-06-02 17:43:42 UTC (rev 17469) +++ root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml 2010-06-02 18:41:18 UTC (rev 17470) @@ -38,8 +38,8 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.5</source> + <target>1.5</target> </configuration> </plugin> <plugin> @@ -58,6 +58,38 @@ <profiles> <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> + + <dependencies> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> <id>release</id> <build> <plugins> @@ -95,8 +127,8 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-bom</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-bom</artifactId> <version>4.0.0-SNAPSHOT</version> <scope>import</scope> <type>pom</type> @@ -108,7 +140,6 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-components-ui</artifactId> - <version>4.0.0-SNAPSHOT</version> </dependency> <dependency> @@ -120,16 +151,50 @@ <artifactId>jsf-impl</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>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + </dependency> + + <!-- simple logger binding: only messages of level INFO and higher are printed--> + <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> + <artifactId>slf4j-log4j12</artifactId> <version>1.5.8</version> </dependency> + + <!-- Log4J dependency used in examples --> <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + + <!-- Tests --> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>5.10</version> Modified: root/examples/richfaces-showcase/trunk/pom.xml =================================================================== --- root/examples/richfaces-showcase/trunk/pom.xml 2010-06-02 17:43:42 UTC (rev 17469) +++ root/examples/richfaces-showcase/trunk/pom.xml 2010-06-02 18:41:18 UTC (rev 17470) @@ -35,20 +35,6 @@ <scope>import</scope> <type>pom</type> </dependency> - - <!-- simple logger binding: only messages of level INFO and higher are printed--> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.8</version> - </dependency> - - <!-- Log4J dependency used in examples --> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> </dependencies> </dependencyManagement> @@ -85,13 +71,19 @@ <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> </dependency> + + <!-- simple logger binding: only messages of level INFO and higher are printed--> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> </dependency> + + <!-- Log4J dependency used in examples --> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <version>1.2.14</version> </dependency> </dependencies> @@ -106,10 +98,8 @@ <dependencies> <dependency> <groupId>org.richfaces</groupId> - <artifactId>richfaces-build-checkstyle - </artifactId> - <version>${richfaces.checkstyle.version} - </version> + <artifactId>richfaces-build-checkstyle</artifactId> + <version>${richfaces.checkstyle.version}</version> </dependency> </dependencies> </plugin> @@ -141,19 +131,19 @@ </build> <profiles> - <profile> - <id>jdk5</id> - <activation> - <jdk>1.5</jdk> - </activation> - <dependencies> + <profile> + <id>jdk5</id> + <activation> + <jdk>1.5</jdk> + </activation> + <dependencies> <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>2.2</version> </dependency> - </dependencies> - </profile> + </dependencies> + </profile> <profile> <id>release</id> <build> @@ -212,8 +202,6 @@ </executions> </plugin> </plugins> - - </build> </profile> <profile>