[richfaces-svn-commits] JBoss Rich Faces SVN: r17355 - in root: examples/richfaces-showcase/trunk and 6 other directories.

Author: Alex.Kolonitsky Date: 2010-05-28 08:45:21 -0400 (Fri, 28 May 2010) New Revision: 17355 Added: root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/ root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml Modified: root/examples-sandbox/trunk/components/tables/pom.xml root/examples/pom.xml root/examples/richfaces-showcase/trunk/pom.xml root/ui/dist/trunk/pom.xml root/ui/dist/trunk/richfaces-components-impl/pom.xml root/ui/iteration/trunk/bom/pom.xml root/ui/iteration/trunk/dist/pom.xml Log: add iteration impl Modified: root/examples/pom.xml =================================================================== --- root/examples/pom.xml 2010-05-28 12:32:32 UTC (rev 17354) +++ root/examples/pom.xml 2010-05-28 12:45:21 UTC (rev 17355) @@ -48,7 +48,7 @@ <jetty.port>8080</jetty.port> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <richfaces.checkstyle.version>4.0.0-SNAPSHOT</richfaces.checkstyle.version> + <richfaces.checkstyle.version>1</richfaces.checkstyle.version> </properties> <dependencyManagement> Modified: root/examples/richfaces-showcase/trunk/pom.xml =================================================================== --- root/examples/richfaces-showcase/trunk/pom.xml 2010-05-28 12:32:32 UTC (rev 17354) +++ root/examples/richfaces-showcase/trunk/pom.xml 2010-05-28 12:45:21 UTC (rev 17355) @@ -49,14 +49,14 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>tables-ui</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-ui</artifactId> <version>4.0.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-misc-ui</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-misc-ui</artifactId> + <version>4.0.0-SNAPSHOT</version> </dependency> </dependencies> Modified: root/examples-sandbox/trunk/components/tables/pom.xml =================================================================== --- root/examples-sandbox/trunk/components/tables/pom.xml 2010-05-28 12:32:32 UTC (rev 17354) +++ root/examples-sandbox/trunk/components/tables/pom.xml 2010-05-28 12:45:21 UTC (rev 17355) @@ -13,27 +13,16 @@ </parent> <groupId>org.richfaces.examples.components</groupId> - <artifactId>${example.componentName}-demo</artifactId> + <artifactId>table-demo</artifactId> <packaging>war</packaging> - <name>Richfaces Sandbox Examples: Tables Demo</name> + <name>Richfaces Sandbox Examples: Iteration Components Demo</name> - <properties> - <example.componentName>tables</example.componentName> - </properties> - <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>${example.componentName}-bom</artifactId> - <version>4.0.0-SNAPSHOT</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-iteration-bom</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>${project.version}</version> <scope>import</scope> <type>pom</type> </dependency> @@ -42,24 +31,24 @@ <dependencies> <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>datascroller-api</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-api</artifactId> </dependency> <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>datascroller-ui</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-ui</artifactId> </dependency> <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>tables-ui</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-impl</artifactId> </dependency> <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>tables-api</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-api</artifactId> </dependency> <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>tables-impl</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-ui</artifactId> </dependency> <!-- API implementation for runtime --> Modified: root/ui/dist/trunk/pom.xml =================================================================== --- root/ui/dist/trunk/pom.xml 2010-05-28 12:32:32 UTC (rev 17354) +++ root/ui/dist/trunk/pom.xml 2010-05-28 12:45:21 UTC (rev 17355) @@ -38,7 +38,7 @@ <modules> <!-- aggregate modules --> <module>richfaces-components-api</module> - <!--<module>richfaces-components-impl</module>--> + <module>richfaces-components-impl</module> <module>richfaces-components-ui</module> </modules> Modified: root/ui/dist/trunk/richfaces-components-impl/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-05-28 12:32:32 UTC (rev 17354) +++ root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-05-28 12:45:21 UTC (rev 17355) @@ -43,25 +43,18 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-core-bom</artifactId> + <artifactId>richfaces-ui-iteration-bom</artifactId> <version>${project.version}</version> <scope>import</scope> <type>pom</type> </dependency> - <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.ui-sandbox</groupId> - <artifactId>tables-impl</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-impl</artifactId> </dependency> <!-- for javadoc generation --> @@ -161,7 +154,6 @@ <artifactSet> <includes> <include>org.richfaces.ui:*</include> - <include>org.richfaces.ui-sandbox:*</include> </includes> </artifactSet> <createSourcesJar>true</createSourcesJar> @@ -184,7 +176,26 @@ <id>release</id> <build> <plugins> + <plugin> + <!-- unpack necessary dependencies for collecting javadocs --> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>deps</id> + <phase>process-sources</phase> + <goals> + <goal>unpack-dependencies</goal> + </goals> + <configuration> + <classifier>sources</classifier> + <includeGroupIds>${assembly.projects.group}</includeGroupIds> + <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> + <excludeTransitive>true</excludeTransitive> + </configuration> + </execution> + </executions> + </plugin> <plugin> <artifactId>maven-javadoc-plugin</artifactId> <version>2.7</version> @@ -196,14 +207,7 @@ <goal>jar</goal> </goals> <configuration> - <!-- switch on dependency-driven aggregation --> - <includeDependencySources>true</includeDependencySources> - - <dependencySourceIncludes> - <!-- exclude ONLY commons-cli artifacts --> - <dependencySourceInclude>org.richfaces.ui:*</dependencySourceInclude> - <dependencySourceInclude>org.richfaces.ui-sandbox:*</dependencySourceInclude> - </dependencySourceIncludes> + <sourcepath>${basedir}/target/dependency</sourcepath> </configuration> </execution> </executions> Modified: root/ui/iteration/trunk/bom/pom.xml =================================================================== --- root/ui/iteration/trunk/bom/pom.xml 2010-05-28 12:32:32 UTC (rev 17354) +++ root/ui/iteration/trunk/bom/pom.xml 2010-05-28 12:45:21 UTC (rev 17355) @@ -57,6 +57,11 @@ </dependency> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-iteration-api</artifactId> <version>${project.version}</version> </dependency> Modified: root/ui/iteration/trunk/dist/pom.xml =================================================================== --- root/ui/iteration/trunk/dist/pom.xml 2010-05-28 12:32:32 UTC (rev 17354) +++ root/ui/iteration/trunk/dist/pom.xml 2010-05-28 12:45:21 UTC (rev 17355) @@ -38,6 +38,7 @@ <modules> <!-- aggregate modules --> <module>richfaces-ui-iteration-api</module> + <module>richfaces-ui-iteration-impl</module> <module>richfaces-ui-iteration-ui</module> </modules> </project> \ No newline at end of file Copied: root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml (from rev 17352, root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml) =================================================================== --- root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml (rev 0) +++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml 2010-05-28 12:45:21 UTC (rev 17355) @@ -0,0 +1,154 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + JBoss, Home of Professional Open Source Copyright 2010, Red Hat, + Inc. and individual contributors by the @authors tag. See the + copyright.txt in the distribution for a full listing of + individual contributors. This is free software; you can + redistribute it and/or modify it under the terms of the GNU + Lesser General Public License as published by the Free Software + Foundation; either version 2.1 of the License, or (at your + option) any later version. This software is distributed in the + hope that it will be useful, but WITHOUT ANY WARRANTY; without + even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public License + for more details. You should have received a copy of the GNU + Lesser General Public License along with this software; if not, + write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: + 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"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>6</version> + </parent> + + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-impl</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Richfaces UI Iteration API</name> + + <properties> + <assembly.projects.group>org.richfaces.ui.iteration</assembly.projects.group> + <faces-shade-transformers.version>4.0.0-SNAPSHOT</faces-shade-transformers.version> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-bom</artifactId> + <version>${project.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <!-- artifacts for aggregation --> + <dependency> + <groupId>${assembly.projects.group}</groupId> + <artifactId>tables-impl</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- artifacts for javadoc generation --> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>1.3.3</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <includes> + <include>${assembly.projects.group}:*</include> + </includes> + </artifactSet> + <createSourcesJar>true</createSourcesJar> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.richfaces.build.resources</groupId> + <artifactId>faces-shade-transformers</artifactId> + <version>${faces-shade-transformers.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + + + <profiles> + <profile> + <id>release</id> + + <build> + <plugins> + <plugin> + <!-- unpack necessary dependencies for collecting javadocs --> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>deps</id> + <phase>process-sources</phase> + <goals> + <goal>unpack-dependencies</goal> + </goals> + <configuration> + <classifier>sources</classifier> + + <includeGroupIds>${assembly.projects.group}</includeGroupIds> + <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> + <excludeTransitive>true</excludeTransitive> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.7</version> + <executions> + <execution> + <id>javadoc-jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <sourcepath>${basedir}/target/dependency</sourcepath> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> \ No newline at end of file