[richfaces-svn-commits] JBoss Rich Faces SVN: r16018 - in branches/community/3.3.X: framework/test and 13 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Thu Nov 26 20:30:10 EST 2009
Author: nbelaevski
Date: 2009-11-26 20:30:09 -0500 (Thu, 26 Nov 2009)
New Revision: 16018
Modified:
branches/community/3.3.X/framework/impl/pom.xml
branches/community/3.3.X/framework/test/pom.xml
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/functional-test/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
branches/community/3.3.X/test-applications/pom.xml
branches/community/3.3.X/test-applications/seamApp/web/pom.xml
branches/community/3.3.X/ui/assembly/pom.xml
branches/community/3.3.X/ui/pom.xml
Log:
Classifier "jsf2" changed to *-jsf2 suffix for artifactId
Modified: branches/community/3.3.X/framework/impl/pom.xml
===================================================================
--- branches/community/3.3.X/framework/impl/pom.xml 2009-11-26 22:32:32 UTC (rev 16017)
+++ branches/community/3.3.X/framework/impl/pom.xml 2009-11-27 01:30:09 UTC (rev 16018)
@@ -7,7 +7,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
+ <artifactId>${classifiedArtifactId}</artifactId>
<name>Java Server Faces AJAX framework implementation</name>
<version>3.3.3-SNAPSHOT</version>
<build>
@@ -167,12 +167,6 @@
<skip>false</skip>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <classifier>jsf2</classifier>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
@@ -184,6 +178,7 @@
</dependencies>
<properties>
<frameworkAdditionalSourceFolder>src/main/java-jsf20</frameworkAdditionalSourceFolder>
+ <classifiedArtifactId>richfaces-impl-jsf2</classifiedArtifactId>
</properties>
</profile>
<profile>
@@ -200,6 +195,7 @@
</dependencies>
<properties>
<frameworkAdditionalSourceFolder>src/main/java-jsf12</frameworkAdditionalSourceFolder>
+ <classifiedArtifactId>richfaces-impl</classifiedArtifactId>
</properties>
</profile>
</profiles>
Modified: branches/community/3.3.X/framework/test/pom.xml
===================================================================
--- branches/community/3.3.X/framework/test/pom.xml 2009-11-26 22:32:32 UTC (rev 16017)
+++ branches/community/3.3.X/framework/test/pom.xml 2009-11-27 01:30:09 UTC (rev 16018)
@@ -13,15 +13,14 @@
<url>https://ajax4jsf.dev.java.net</url>
<profiles>
- <profile>
+ <profile>
<id>jsf2_0</id>
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
+ <artifactId>richfaces-impl-jsf2</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <classifier>jsf2</classifier>
</dependency>
</dependencies>
</profile>
Modified: branches/community/3.3.X/samples/darkX/pom.xml
===================================================================
--- branches/community/3.3.X/samples/darkX/pom.xml 2009-11-26 22:32:32 UTC (rev 16017)
+++ branches/community/3.3.X/samples/darkX/pom.xml 2009-11-27 01:30:09 UTC (rev 16018)
@@ -38,8 +38,7 @@
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <classifier>jsf2</classifier>
+ <artifactId>richfaces-impl-jsf2</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/3.3.X/samples/glassX/pom.xml
===================================================================
--- branches/community/3.3.X/samples/glassX/pom.xml 2009-11-26 22:32:32 UTC (rev 16017)
+++ branches/community/3.3.X/samples/glassX/pom.xml 2009-11-27 01:30:09 UTC (rev 16018)
@@ -39,8 +39,7 @@
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <classifier>jsf2</classifier>
+ <artifactId>richfaces-impl-jsf2</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/3.3.X/samples/laguna/pom.xml
===================================================================
--- branches/community/3.3.X/samples/laguna/pom.xml 2009-11-26 22:32:32 UTC (rev 16017)
+++ branches/community/3.3.X/samples/laguna/pom.xml 2009-11-27 01:30:09 UTC (rev 16018)
@@ -30,8 +30,7 @@
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <classifier>jsf2</classifier>
+ <artifactId>richfaces-impl-jsf2</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/3.3.X/samples/pom.xml
===================================================================
--- branches/community/3.3.X/samples/pom.xml 2009-11-26 22:32:32 UTC (rev 16017)
+++ branches/community/3.3.X/samples/pom.xml 2009-11-27 01:30:09 UTC (rev 16018)
@@ -44,9 +44,8 @@
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
+ <artifactId>richfaces-impl-jsf2</artifactId>
<version>${project.version}</version>
- <classifier>jsf2</classifier>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
@@ -255,8 +254,7 @@
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <classifier>jsf2</classifier>
+ <artifactId>richfaces-impl-jsf2</artifactId>
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml
===================================================================
--- branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2009-11-26 22:32:32 UTC (rev 16017)
+++ branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2009-11-27 01:30:09 UTC (rev 16018)
@@ -59,7 +59,7 @@
</pluginRepository>
</pluginRepositories>
<properties>
- <demo.classifier />
+ <demo.artifactId.suffix />
<demo.version>${project.version}</demo.version>
<resources.dir>${project.build.directory}/test-classes</resources.dir>
<extensions.dir>${resources.dir}/user-extensions</extensions.dir>
@@ -225,6 +225,12 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jsf2_0</id>
+ <properties>
+ <demo.artifactId.suffix>-jsf2</demo.artifactId.suffix>
+ </properties>
+ </profile>
<!-- Container Profile -->
<profile>
<id>container</id>
@@ -236,19 +242,11 @@
<dependencies>
<dependency>
<groupId>org.richfaces.samples</groupId>
- <artifactId>richfaces-demo</artifactId>
+ <artifactId>richfaces-demo${demo.artifactId.suffix}</artifactId>
<version>${demo.version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.richfaces.samples</groupId>
- <artifactId>richfaces-demo</artifactId>
- <version>${demo.version}</version>
- <classifier>jsf2</classifier>
- <type>war</type>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -294,9 +292,8 @@
<deployables>
<deployable>
<groupId>org.richfaces.samples</groupId>
- <artifactId>richfaces-demo</artifactId>
+ <artifactId>richfaces-demo${demo.artifactId.suffix}</artifactId>
<type>war</type>
- <classifier>${demo.classifier}</classifier>
<properties>
<context>${context.path}</context>
</properties>
Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml
===================================================================
--- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-11-26 22:32:32 UTC (rev 16017)
+++ branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-11-27 01:30:09 UTC (rev 16018)
@@ -8,9 +8,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
- <artifactId>richfaces-demo</artifactId>
+ <artifactId>${classifiedArtifactId}</artifactId>
<packaging>war</packaging>
<name>richfaces-demo Maven Webapp</name>
+ <properties>
+ <classifiedArtifactId>richfaces-demo</classifiedArtifactId>
+ </properties>
<repositories>
<repository>
@@ -204,12 +207,6 @@
<skip>false</skip>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <classifier>jsf2</classifier>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
@@ -230,6 +227,9 @@
<version>2.0.1</version>
</dependency>
</dependencies>
+ <properties>
+ <classifiedArtifactId>richfaces-demo-jsf2</classifiedArtifactId>
+ </properties>
</profile>
</profiles>
<dependencies>
Modified: branches/community/3.3.X/samples/skins/pom.xml
===================================================================
--- branches/community/3.3.X/samples/skins/pom.xml 2009-11-26 22:32:32 UTC (rev 16017)
+++ branches/community/3.3.X/samples/skins/pom.xml 2009-11-27 01:30:09 UTC (rev 16018)
@@ -14,8 +14,7 @@
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <classifier>jsf2</classifier>
+ <artifactId>richfaces-impl-jsf2</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/3.3.X/samples/themes/pom.xml
===================================================================
--- branches/community/3.3.X/samples/themes/pom.xml 2009-11-26 22:32:32 UTC (rev 16017)
+++ branches/community/3.3.X/samples/themes/pom.xml 2009-11-27 01:30:09 UTC (rev 16018)
@@ -43,8 +43,7 @@
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <classifier>jsf2</classifier>
+ <artifactId>richfaces-impl-jsf2</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/3.3.X/samples/violetRays/pom.xml
===================================================================
--- branches/community/3.3.X/samples/violetRays/pom.xml 2009-11-26 22:32:32 UTC (rev 16017)
+++ branches/community/3.3.X/samples/violetRays/pom.xml 2009-11-27 01:30:09 UTC (rev 16018)
@@ -34,8 +34,7 @@
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <classifier>jsf2</classifier>
+ <artifactId>richfaces-impl-jsf2</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/3.3.X/test-applications/pom.xml
===================================================================
--- branches/community/3.3.X/test-applications/pom.xml 2009-11-26 22:32:32 UTC (rev 16017)
+++ branches/community/3.3.X/test-applications/pom.xml 2009-11-27 01:30:09 UTC (rev 16018)
@@ -135,9 +135,8 @@
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
+ <artifactId>richfaces-impl-jsf2</artifactId>
<version>${rfVersion}</version>
- <classifier>jsf2</classifier>
</dependency>
</dependencies>
</profile>
Modified: branches/community/3.3.X/test-applications/seamApp/web/pom.xml
===================================================================
--- branches/community/3.3.X/test-applications/seamApp/web/pom.xml 2009-11-26 22:32:32 UTC (rev 16017)
+++ branches/community/3.3.X/test-applications/seamApp/web/pom.xml 2009-11-27 01:30:09 UTC (rev 16018)
@@ -135,9 +135,8 @@
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
+ <artifactId>richfaces-impl-jsf2</artifactId>
<version>${rfVersion}</version>
- <classifier>jsf2</classifier>
</dependency>
</dependencies>
</profile>
Modified: branches/community/3.3.X/ui/assembly/pom.xml
===================================================================
--- branches/community/3.3.X/ui/assembly/pom.xml 2009-11-26 22:32:32 UTC (rev 16017)
+++ branches/community/3.3.X/ui/assembly/pom.xml 2009-11-27 01:30:09 UTC (rev 16018)
@@ -444,9 +444,8 @@
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
+ <artifactId>richfaces-impl-jsf2</artifactId>
<version>3.3.3-SNAPSHOT</version>
- <classifier>jsf2</classifier>
</dependency>
</dependencies>
</profile>
Modified: branches/community/3.3.X/ui/pom.xml
===================================================================
--- branches/community/3.3.X/ui/pom.xml 2009-11-26 22:32:32 UTC (rev 16017)
+++ branches/community/3.3.X/ui/pom.xml 2009-11-27 01:30:09 UTC (rev 16018)
@@ -97,9 +97,8 @@
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
+ <artifactId>richfaces-impl-jsf2</artifactId>
<version>${project.version}</version>
- <classifier>jsf2</classifier>
<scope>provided</scope>
</dependency>
</dependencies>
More information about the richfaces-svn-commits
mailing list