[richfaces-svn-commits] JBoss Rich Faces SVN: r17071 - in root: core/trunk and 8 other directories.

Author: Alex.Kolonitsky Date: 2010-05-17 07:21:39 -0400 (Mon, 17 May 2010) New Revision: 17071 Modified: root/commons/trunk/api/pom.xml root/core/trunk/bom/pom.xml root/core/trunk/parent/pom.xml root/core/trunk/pom.xml root/ui-sandbox/componentcontrol/trunk/pom.xml root/ui-sandbox/datascroller/trunk/parent/pom.xml root/ui-sandbox/datascroller/trunk/pom.xml root/ui-sandbox/pom.xml root/ui-sandbox/tables/trunk/parent/pom.xml root/ui-sandbox/tables/trunk/pom.xml Log: correct bom/parent model Modified: root/commons/trunk/api/pom.xml =================================================================== --- root/commons/trunk/api/pom.xml 2010-05-17 11:20:15 UTC (rev 17070) +++ root/commons/trunk/api/pom.xml 2010-05-17 11:21:39 UTC (rev 17071) @@ -63,12 +63,12 @@ </dependency> </dependencies> - <build> +<!-- <build> <plugins> - <!-- Trigger checkstyle checking for this module --> + &lt;!&ndash; Trigger checkstyle checking for this module &ndash;&gt; <plugin> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> </plugins> - </build> + </build>--> </project> \ No newline at end of file Modified: root/core/trunk/bom/pom.xml =================================================================== --- root/core/trunk/bom/pom.xml 2010-05-17 11:20:15 UTC (rev 17070) +++ root/core/trunk/bom/pom.xml 2010-05-17 11:21:39 UTC (rev 17071) @@ -20,18 +20,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-aggregator</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-bom</artifactId> <packaging>pom</packaging> - <version>4.0.0-SNAPSHOT</version> <name>RichFaces Core BOM</name> - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>1-SNAPSHOT</version> - </parent> - <description> The RichFaces Core "Bill of Materials". This defines core api/impl specific runtime dependency versions. </description> Modified: root/core/trunk/parent/pom.xml =================================================================== --- root/core/trunk/parent/pom.xml 2010-05-17 11:20:15 UTC (rev 17070) +++ root/core/trunk/parent/pom.xml 2010-05-17 11:21:39 UTC (rev 17071) @@ -21,22 +21,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-aggregator</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-parent</artifactId> <packaging>pom</packaging> - <version>4.0.0-SNAPSHOT</version> <name>RichFaces Core Parent</name> - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>1-SNAPSHOT</version> - </parent> - <description> The Parent for all RichFaces core sub-projects. This specifies build and project meta-data. Runtime dependencies are imported via the bom. </description> + <modules> + <module>../api</module> + <module>../impl</module> + </modules> + <properties> <richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version> </properties> Modified: root/core/trunk/pom.xml =================================================================== --- root/core/trunk/pom.xml 2010-05-17 11:20:15 UTC (rev 17070) +++ root/core/trunk/pom.xml 2010-05-17 11:21:39 UTC (rev 17071) @@ -40,8 +40,8 @@ <modules> <module>bom</module> <module>parent</module> - <module>api</module> - <module>impl</module> + <!--<module>api</module>--> + <!--<module>impl</module>--> </modules> </project> Modified: root/ui-sandbox/componentcontrol/trunk/pom.xml =================================================================== --- root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-17 11:20:15 UTC (rev 17070) +++ root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-17 11:21:39 UTC (rev 17071) @@ -1,18 +1,30 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>1-SNAPSHOT</version> + <groupId>org.richfaces.sandbox.ui</groupId> + <artifactId>components</artifactId> + <version>4.0.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>componentControl</artifactId> <name>Richfaces UI Components: Component Control</name> <packaging>jar</packaging> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-bom</artifactId> + <version>4.0.0-SNAPSHOT</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> <dependencies> <dependency> @@ -22,8 +34,66 @@ </dependency> <dependency> <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-impl</artifactId> </dependency> + + <!-- JSF --> + <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> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Tests --> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> Modified: root/ui-sandbox/datascroller/trunk/parent/pom.xml =================================================================== --- root/ui-sandbox/datascroller/trunk/parent/pom.xml 2010-05-17 11:20:15 UTC (rev 17070) +++ root/ui-sandbox/datascroller/trunk/parent/pom.xml 2010-05-17 11:21:39 UTC (rev 17071) @@ -26,7 +26,7 @@ <parent> <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>datascroller-bom</artifactId> + <artifactId>datascroller-aggregator</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> @@ -35,23 +35,59 @@ <name>Richfaces UI Components: Datascroller Parent Module</name> <packaging>pom</packaging> - <distributionManagement> - <downloadUrl> - http://labs.jboss.com/portal/jbossrichfaces/downloads - </downloadUrl> - <repository> - <id>jboss-releases-repository</id> - <uniqueVersion>false</uniqueVersion> - <url>${releaseRepository}</url> - </repository> - <snapshotRepository> - <id>jboss-snapshots-repository</id> - <uniqueVersion>true</uniqueVersion> - <url>${snapshotRepository}</url> - </snapshotRepository> - </distributionManagement> + <modules> + <module>../api</module> + <module>../ui</module> + </modules> - <build> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.ui-sandbox</groupId> + <artifactId>datascroller-bom</artifactId> + <version>${project.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + + <!-- Archetypes dependency --> + <dependency> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.0-alpha-4</version> + </dependency> + + <!-- tests --> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-test-stage</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> <pluginManagement> <plugins> <plugin> @@ -112,44 +148,4 @@ </plugin> </plugins> </build> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - - <!-- Archetypes dependency --> - <dependency> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>2.0-alpha-4</version> - </dependency> - - <!-- tests --> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - </dependency> - </dependencies> - </dependencyManagement> - </project> Modified: root/ui-sandbox/datascroller/trunk/pom.xml =================================================================== --- root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-17 11:20:15 UTC (rev 17070) +++ root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-17 11:21:39 UTC (rev 17071) @@ -19,23 +19,28 @@ http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>components</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>datascroller-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Richfaces UI Components: Datascroller Aggregator</name> + <artifactId>datascroller-aggregator</artifactId> + <packaging>pom</packaging> + <name>Richfaces UI Components: Datascroller Aggregator</name> + <modules> + <module>bom</module> + <module>parent</module> + </modules> + <build> <plugins> <plugin> @@ -49,11 +54,4 @@ </plugins> </build> - <modules> - <module>bom</module> - <module>parent</module> - <module>api</module> - <module>ui</module> - </modules> - </project> \ No newline at end of file Modified: root/ui-sandbox/pom.xml =================================================================== --- root/ui-sandbox/pom.xml 2010-05-17 11:20:15 UTC (rev 17070) +++ root/ui-sandbox/pom.xml 2010-05-17 11:21:39 UTC (rev 17071) @@ -38,82 +38,75 @@ <modules> <module>tables/trunk</module> <module>datascroller/trunk</module> + <module>componentcontrol/trunk</module> </modules> <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core-api</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>4.0.0-SNAPSHOT</version> </dependency> + + <!-- Archetypes dependency --> + <dependency> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.0-alpha-4</version> + </dependency> + + <!-- tests --> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-test-stage</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + </dependency> </dependencies> </dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - - <!-- JSF --> - <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> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </dependency> - - <!-- Tests --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>4.0.0-SNAPSHOT</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xml-maven-plugin</artifactId> + <version>1.0-beta-2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-archetype-plugin</artifactId> + <version>2.0-alpha-4</version> + <extensions>true</extensions> + </plugin> + </plugins> + </pluginManagement> + <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> Modified: root/ui-sandbox/tables/trunk/parent/pom.xml =================================================================== --- root/ui-sandbox/tables/trunk/parent/pom.xml 2010-05-17 11:20:15 UTC (rev 17070) +++ root/ui-sandbox/tables/trunk/parent/pom.xml 2010-05-17 11:21:39 UTC (rev 17071) @@ -26,58 +26,95 @@ <parent> <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>tables-bom</artifactId> + <artifactId>tables-aggregator</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>tables-parent</artifactId> - <name>Richfaces UI Components: Tables Parent Module</name> + <name>Richfaces UI Components: Tables Parent</name> <packaging>pom</packaging> - <distributionManagement> - <downloadUrl> - http://labs.jboss.com/portal/jbossrichfaces/downloads - </downloadUrl> - <repository> - <id>jboss-releases-repository</id> - <uniqueVersion>false</uniqueVersion> - <url>${releaseRepository}</url> - </repository> - <snapshotRepository> - <id>jboss-snapshots-repository</id> - <uniqueVersion>true</uniqueVersion> - <url>${snapshotRepository}</url> - </snapshotRepository> - </distributionManagement> + <modules> + <module>../api</module> + <module>../impl</module> + <module>../ui</module> + </modules> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>4.0.0-SNAPSHOT</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0-beta-2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-archetype-plugin</artifactId> - <version>2.0-alpha-4</version> - <extensions>true</extensions> - </plugin> - </plugins> - </pluginManagement> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.ui-sandbox</groupId> + <artifactId>tables-bom</artifactId> + <version>${project.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + </dependency> + + <!-- JSF --> + <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> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Tests --> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -112,44 +149,4 @@ </plugin> </plugins> </build> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - - <!-- Archetypes dependency --> - <dependency> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>2.0-alpha-4</version> - </dependency> - - <!-- tests --> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - </dependency> - </dependencies> - </dependencyManagement> - </project> Modified: root/ui-sandbox/tables/trunk/pom.xml =================================================================== --- root/ui-sandbox/tables/trunk/pom.xml 2010-05-17 11:20:15 UTC (rev 17070) +++ root/ui-sandbox/tables/trunk/pom.xml 2010-05-17 11:21:39 UTC (rev 17071) @@ -31,10 +31,14 @@ <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>tables-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Richfaces UI Components: Tables Aggregator</name> + <modules> + <module>bom</module> + <module>parent</module> + </modules> + <build> <plugins> <plugin> @@ -48,12 +52,4 @@ </plugins> </build> - <modules> - <module>bom</module> - <module>parent</module> - <module>api</module> - <module>impl</module> - <module>ui</module> - </modules> - </project> \ No newline at end of file