[richfaces-svn-commits] JBoss Rich Faces SVN: r15966 - in branches/community/3.3.X/samples: colorPickerDemo and 2 other directories.

Author: nbelaevski Date: 2009-11-22 21:18:12 -0500 (Sun, 22 Nov 2009) New Revision: 15966 Modified: branches/community/3.3.X/samples/colorPickerDemo/pom.xml branches/community/3.3.X/samples/layout-sample/pom.xml branches/community/3.3.X/samples/pom.xml branches/community/3.3.X/samples/richfaces-demo/pom.xml Log: Examples: merged from 3.3.x_jsf2 branch Modified: branches/community/3.3.X/samples/colorPickerDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/colorPickerDemo/pom.xml 2009-11-23 01:53:43 UTC (rev 15965) +++ branches/community/3.3.X/samples/colorPickerDemo/pom.xml 2009-11-23 02:18:12 UTC (rev 15966) @@ -32,12 +32,6 @@ </dependency> <dependency> - <groupId>org.richfaces.framework - </groupId> - <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> - </dependency> - <dependency> <groupId>org.richfaces.samples </groupId> <artifactId>skins</artifactId> Modified: branches/community/3.3.X/samples/layout-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/layout-sample/pom.xml 2009-11-23 01:53:43 UTC (rev 15965) +++ branches/community/3.3.X/samples/layout-sample/pom.xml 2009-11-23 02:18:12 UTC (rev 15966) @@ -32,11 +32,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> - </dependency> - <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> <version>3.3.3-SNAPSHOT</version> Modified: branches/community/3.3.X/samples/pom.xml =================================================================== --- branches/community/3.3.X/samples/pom.xml 2009-11-23 01:53:43 UTC (rev 15965) +++ branches/community/3.3.X/samples/pom.xml 2009-11-23 02:18:12 UTC (rev 15966) @@ -64,11 +64,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> <version>1.1.14</version> @@ -116,6 +111,11 @@ </build> <dependencies> <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <version>1.0</version> @@ -169,6 +169,11 @@ </build> <dependencies> <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> @@ -190,7 +195,55 @@ <artifactId>jsf-impl</artifactId> <version>1.2_12</version> <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf2_0</id> + <build> + <defaultGoal>jetty:run</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${project.version}</version> + <classifier>jsf2</classifier> </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> </dependencies> </profile> <profile> @@ -235,17 +288,6 @@ <version>2.0</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_12</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_12</version> - <scope>runtime</scope> - </dependency> </dependencies> </profile> <profile> @@ -281,17 +323,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_12</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_12</version> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <version>1.0</version> @@ -334,18 +365,6 @@ <version>2.0</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_12</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_12</version> - <scope>provided</scope> - </dependency> </dependencies> </profile> <profile> Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-11-23 01:53:43 UTC (rev 15965) +++ branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-11-23 02:18:12 UTC (rev 15966) @@ -194,12 +194,39 @@ </dependency> </dependencies> </profile> + <profile> + <id>jsf2_0</id> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.1</version> + <exclusions> + <exclusion> + <artifactId>javax.el</artifactId> + <groupId>el-api</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.1</version> + <exclusions> + <exclusion> + <artifactId>javax.el</artifactId> + <groupId>el-api</groupId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </profile> </profiles> <dependencies> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> - <version>3.1.0.CR1</version> + <version>3.1.0.GA</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -297,7 +324,7 @@ <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> - <version>2.1.0.SP1</version> + <version>2.2.0.GA</version> <exclusions> <exclusion> <groupId>org.richfaces.framework</groupId> @@ -356,7 +383,7 @@ <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-ui</artifactId> - <version>2.1.0.SP1</version> + <version>2.2.0.GA</version> <exclusions> <exclusion> <artifactId>jsf-api</artifactId> @@ -371,7 +398,7 @@ <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-debug</artifactId> - <version>2.1.0.SP1</version> + <version>2.2.0.GA</version> <exclusions> <exclusion> <artifactId>jsf-api</artifactId> @@ -397,19 +424,12 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> - <version>3.3.0.ga</version> + <version>3.4.0.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.6.ga</version> - - <exclusions> - <exclusion> - <artifactId>commons-collections</artifactId> - <groupId>commons-collections</groupId> - </exclusion> - </exclusions> + <artifactId>hibernate-core</artifactId> + <version>3.3.2.GA</version> </dependency> </dependencies> </project>