[richfaces-svn-commits] JBoss Rich Faces SVN: r15992 - in branches/community/3.3.X/samples: darkX and 6 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Tue Nov 24 18:08:31 EST 2009
Author: nbelaevski
Date: 2009-11-24 18:08:30 -0500 (Tue, 24 Nov 2009)
New Revision: 15992
Modified:
branches/community/3.3.X/samples/darkX/pom.xml
branches/community/3.3.X/samples/glassX/pom.xml
branches/community/3.3.X/samples/laguna/pom.xml
branches/community/3.3.X/samples/pom.xml
branches/community/3.3.X/samples/richfaces-demo/pom.xml
branches/community/3.3.X/samples/skins/pom.xml
branches/community/3.3.X/samples/themes/pom.xml
branches/community/3.3.X/samples/violetRays/pom.xml
Log:
Configuration updated for JSF2 - continued
Modified: branches/community/3.3.X/samples/darkX/pom.xml
===================================================================
--- branches/community/3.3.X/samples/darkX/pom.xml 2009-11-24 19:24:34 UTC (rev 15991)
+++ branches/community/3.3.X/samples/darkX/pom.xml 2009-11-24 23:08:30 UTC (rev 15992)
@@ -32,41 +32,26 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>jsf1_2</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jsf2_0</id>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>${project.version}</version>
- <classifier>jsf2</classifier>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/samples/glassX/pom.xml
===================================================================
--- branches/community/3.3.X/samples/glassX/pom.xml 2009-11-24 19:24:34 UTC (rev 15991)
+++ branches/community/3.3.X/samples/glassX/pom.xml 2009-11-24 23:08:30 UTC (rev 15992)
@@ -33,40 +33,26 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>jsf1_2</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jsf2_0</id>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>${project.version}</version>
- <classifier>jsf2</classifier>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/samples/laguna/pom.xml
===================================================================
--- branches/community/3.3.X/samples/laguna/pom.xml 2009-11-24 19:24:34 UTC (rev 15991)
+++ branches/community/3.3.X/samples/laguna/pom.xml 2009-11-24 23:08:30 UTC (rev 15992)
@@ -24,4 +24,22 @@
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
</project>
Modified: branches/community/3.3.X/samples/pom.xml
===================================================================
--- branches/community/3.3.X/samples/pom.xml 2009-11-24 19:24:34 UTC (rev 15991)
+++ branches/community/3.3.X/samples/pom.xml 2009-11-24 23:08:30 UTC (rev 15992)
@@ -14,6 +14,53 @@
<properties>
<!-- -->
</properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <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>
+ </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>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>${project.version}</version>
+ <classifier>jsf2</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
<build>
<plugins>
@@ -60,7 +107,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -113,7 +159,6 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
@@ -167,7 +212,6 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -184,12 +228,10 @@
<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>
@@ -214,18 +256,15 @@
<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>
@@ -386,7 +425,6 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>javax.faces</groupId>
Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml
===================================================================
--- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-11-24 19:24:34 UTC (rev 15991)
+++ branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-11-24 23:08:30 UTC (rev 15992)
@@ -277,7 +277,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -374,7 +373,7 @@
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
</dependency>
-<dependency>
+ <dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr</artifactId>
<version>3.0</version>
@@ -410,7 +409,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
+ <dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
<version>1.0</version>
Modified: branches/community/3.3.X/samples/skins/pom.xml
===================================================================
--- branches/community/3.3.X/samples/skins/pom.xml 2009-11-24 19:24:34 UTC (rev 15991)
+++ branches/community/3.3.X/samples/skins/pom.xml 2009-11-24 23:08:30 UTC (rev 15992)
@@ -8,5 +8,21 @@
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
<name>skins</name>
- <dependencies />
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/samples/themes/pom.xml
===================================================================
--- branches/community/3.3.X/samples/themes/pom.xml 2009-11-24 19:24:34 UTC (rev 15991)
+++ branches/community/3.3.X/samples/themes/pom.xml 2009-11-24 23:08:30 UTC (rev 15992)
@@ -10,34 +10,6 @@
<artifactId>themes</artifactId>
<version>3.3.3-SNAPSHOT</version>
<name>themes</name>
- <profiles>
- <profile>
- <id>jsf1_2</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jsf2_0</id>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>${project.version}</version>
- <classifier>jsf2</classifier>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<build>
<plugins>
<plugin>
@@ -68,13 +40,27 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: branches/community/3.3.X/samples/violetRays/pom.xml
===================================================================
--- branches/community/3.3.X/samples/violetRays/pom.xml 2009-11-24 19:24:34 UTC (rev 15991)
+++ branches/community/3.3.X/samples/violetRays/pom.xml 2009-11-24 23:08:30 UTC (rev 15992)
@@ -32,13 +32,27 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
More information about the richfaces-svn-commits
mailing list