Author: nbelaevski
Date: 2010-08-11 18:59:48 -0400 (Wed, 11 Aug 2010)
New Revision: 18579
Modified:
trunk/ui/common/ui/pom.xml
trunk/ui/core/ui/pom.xml
trunk/ui/dist/richfaces-components-api/pom.xml
trunk/ui/dist/richfaces-components-ui/pom.xml
trunk/ui/iteration/api/pom.xml
trunk/ui/iteration/ui/pom.xml
trunk/ui/misc/ui/pom.xml
trunk/ui/output/api/pom.xml
trunk/ui/output/ui/pom.xml
trunk/ui/parent/pom.xml
Log:
ui/common module build integration
Modified: trunk/ui/common/ui/pom.xml
===================================================================
--- trunk/ui/common/ui/pom.xml 2010-08-11 21:21:57 UTC (rev 18578)
+++ trunk/ui/common/ui/pom.xml 2010-08-11 22:59:48 UTC (rev 18579)
@@ -30,7 +30,7 @@
<relativePath>../../parent/pom.xml</relativePath>
</parent>
- <groupId>org.richfaces.ui.commmon</groupId>
+ <groupId>org.richfaces.ui.common</groupId>
<artifactId>richfaces-ui-common-ui</artifactId>
<name>Richfaces UI Components: Common UI</name>
<packaging>jar</packaging>
@@ -40,6 +40,12 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui.common</groupId>
+ <artifactId>richfaces-ui-common-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- runtime -->
<dependency>
<groupId>org.richfaces.core</groupId>
Modified: trunk/ui/core/ui/pom.xml
===================================================================
--- trunk/ui/core/ui/pom.xml 2010-08-11 21:21:57 UTC (rev 18578)
+++ trunk/ui/core/ui/pom.xml 2010-08-11 22:59:48 UTC (rev 18579)
@@ -49,6 +49,10 @@
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-impl</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.richfaces.ui.common</groupId>
+ <artifactId>richfaces-ui-common-ui</artifactId>
+ </dependency>
<dependency>
<groupId>org.richfaces.cdk</groupId>
Modified: trunk/ui/dist/richfaces-components-api/pom.xml
===================================================================
--- trunk/ui/dist/richfaces-components-api/pom.xml 2010-08-11 21:21:57 UTC (rev 18578)
+++ trunk/ui/dist/richfaces-components-api/pom.xml 2010-08-11 22:59:48 UTC (rev 18579)
@@ -40,6 +40,10 @@
<dependencies>
<dependency>
+ <groupId>org.richfaces.ui.common</groupId>
+ <artifactId>richfaces-ui-common-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-api</artifactId>
</dependency>
@@ -147,7 +151,7 @@
<configuration>
<classifier>sources</classifier>
- <includeGroupIds>org.richfaces.ui.iteration,
org.richfaces.ui.output</includeGroupIds>
+ <includeGroupIds>org.richfaces.ui.common,
org.richfaces.ui.iteration, org.richfaces.ui.output</includeGroupIds>
<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
<excludeTransitive>true</excludeTransitive>
</configuration>
Modified: trunk/ui/dist/richfaces-components-ui/pom.xml
===================================================================
--- trunk/ui/dist/richfaces-components-ui/pom.xml 2010-08-11 21:21:57 UTC (rev 18578)
+++ trunk/ui/dist/richfaces-components-ui/pom.xml 2010-08-11 22:59:48 UTC (rev 18579)
@@ -41,6 +41,10 @@
<dependencies>
<!-- artifacts for aggregation -->
<dependency>
+ <groupId>org.richfaces.ui.common</groupId>
+ <artifactId>richfaces-ui-common-ui</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-ui</artifactId>
</dependency>
@@ -173,7 +177,7 @@
<configuration>
<classifier>sources</classifier>
-
<includeGroupIds>${assembly.projects.group}.core, ${assembly.projects.group}.misc,
${assembly.projects.group}.iteration,
${assembly.projects.group}.output</includeGroupIds>
+
<includeGroupIds>${assembly.projects.group}.common, ${assembly.projects.group}.core,
${assembly.projects.group}.misc, ${assembly.projects.group}.iteration,
${assembly.projects.group}.output</includeGroupIds>
<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
<excludeTransitive>true</excludeTransitive>
</configuration>
Modified: trunk/ui/iteration/api/pom.xml
===================================================================
--- trunk/ui/iteration/api/pom.xml 2010-08-11 21:21:57 UTC (rev 18578)
+++ trunk/ui/iteration/api/pom.xml 2010-08-11 22:59:48 UTC (rev 18579)
@@ -64,6 +64,10 @@
<groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-ui</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.richfaces.ui.common</groupId>
+ <artifactId>richfaces-ui-common-api</artifactId>
+ </dependency>
<!-- tests -->
<dependency>
Modified: trunk/ui/iteration/ui/pom.xml
===================================================================
--- trunk/ui/iteration/ui/pom.xml 2010-08-11 21:21:57 UTC (rev 18578)
+++ trunk/ui/iteration/ui/pom.xml 2010-08-11 22:59:48 UTC (rev 18579)
@@ -63,6 +63,10 @@
<artifactId>richfaces-core-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.richfaces.ui.common</groupId>
+ <artifactId>richfaces-ui-common-ui</artifactId>
+ </dependency>
+ <dependency>
<!-- todo remove this dependency or move to test scope -->
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-impl</artifactId>
Modified: trunk/ui/misc/ui/pom.xml
===================================================================
--- trunk/ui/misc/ui/pom.xml 2010-08-11 21:21:57 UTC (rev 18578)
+++ trunk/ui/misc/ui/pom.xml 2010-08-11 22:59:48 UTC (rev 18579)
@@ -69,9 +69,13 @@
<artifactId>annotations</artifactId>
</dependency>
<dependency>
- <groupId>org.richfaces.ui.core</groupId>
+ <groupId>org.richfaces.ui.common</groupId>
+ <artifactId>richfaces-ui-common-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-ui</artifactId>
- </dependency>
+ </dependency>
<!-- JSF with dependencies -->
<dependency>
Modified: trunk/ui/output/api/pom.xml
===================================================================
--- trunk/ui/output/api/pom.xml 2010-08-11 21:21:57 UTC (rev 18578)
+++ trunk/ui/output/api/pom.xml 2010-08-11 22:59:48 UTC (rev 18579)
@@ -40,6 +40,10 @@
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.richfaces.ui.common</groupId>
+ <artifactId>richfaces-ui-common-api</artifactId>
+ </dependency>
<!-- JSF with dependencies -->
<dependency>
Modified: trunk/ui/output/ui/pom.xml
===================================================================
--- trunk/ui/output/ui/pom.xml 2010-08-11 21:21:57 UTC (rev 18578)
+++ trunk/ui/output/ui/pom.xml 2010-08-11 22:59:48 UTC (rev 18579)
@@ -54,6 +54,10 @@
<artifactId>richfaces-core-impl</artifactId>
</dependency>
<dependency>
+ <groupId>org.richfaces.ui.common</groupId>
+ <artifactId>richfaces-ui-common-ui</artifactId>
+ </dependency>
+ <dependency>
<!-- todo remove this dependency -->
<groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-ui</artifactId>
Modified: trunk/ui/parent/pom.xml
===================================================================
--- trunk/ui/parent/pom.xml 2010-08-11 21:21:57 UTC (rev 18578)
+++ trunk/ui/parent/pom.xml 2010-08-11 22:59:48 UTC (rev 18579)
@@ -40,6 +40,7 @@
<org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version>
<org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version>
<org.richfaces.commons.version>4.0.0-SNAPSHOT</org.richfaces.commons.version>
+
<org.richfaces.ui.common.version>4.0.0-SNAPSHOT</org.richfaces.ui.common.version>
<org.richfaces.ui.core.version>4.0.0-SNAPSHOT</org.richfaces.ui.core.version>
<org.richfaces.ui.misc.version>4.0.0-SNAPSHOT</org.richfaces.ui.misc.version>
<org.richfaces.ui.iteration.version>4.0.0-SNAPSHOT</org.richfaces.ui.iteration.version>
@@ -64,6 +65,17 @@
</dependency>
<dependency>
+ <groupId>org.richfaces.ui.common</groupId>
+ <artifactId>richfaces-ui-common-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui.common</groupId>
+ <artifactId>richfaces-ui-common-ui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-ui</artifactId>
<version>${project.version}</version>