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

Author: Alex.Kolonitsky Date: 2010-05-24 15:11:30 -0400 (Mon, 24 May 2010) New Revision: 17215 Added: root/dist/trunk/release-notes.txt root/ui/dist/trunk/richfaces-ui/ root/ui/dist/trunk/richfaces-ui/pom.xml Modified: root/dist/trunk/pom.xml root/dist/trunk/richfaces.xml root/pom.xml root/ui-sandbox/componentcontrol/trunk/pom.xml root/ui-sandbox/datascroller/trunk/pom.xml root/ui-sandbox/pom.xml root/ui-sandbox/tables/trunk/pom.xml root/ui/core/trunk/parent/pom.xml root/ui/core/trunk/pom.xml root/ui/dist/trunk/assembler.xml root/ui/dist/trunk/pom.xml Log: RF-8461 Add ui assembler Modified: root/dist/trunk/pom.xml =================================================================== --- root/dist/trunk/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/dist/trunk/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -23,6 +23,12 @@ <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1</version> + </parent> + <groupId>org.richfaces</groupId> <artifactId>richfaces-assembler</artifactId> <version>4.0.0-SNAPSHOT</version> @@ -32,15 +38,12 @@ <modules> <module>../../build/parent/tags/richfaces-parent-1</module> <module>../../build/bom/trunk</module> - <!--<module>build/resources/trunk/checkstyle</module>--> <module>../../commons/trunk</module> <module>../../core/trunk</module> - <!--<module>cdk/${cdk.svn.dir}</module>--> - <!--<module>ui/core/${ui.svn.dir}</module>--> - <!--<module>ui-sandbox</module>--> <module>../../examples</module> - <!--<module>examples-sandbox/${examples-sandbox.svn.dir}</module>--> - <!--<module>doc/${doc.svn.dir}</module>--> + + <!-- call ui assembler --> + <module>../../ui/dist/trunk</module> </modules> <build> Added: root/dist/trunk/release-notes.txt =================================================================== Modified: root/dist/trunk/richfaces.xml =================================================================== --- root/dist/trunk/richfaces.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/dist/trunk/richfaces.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -8,6 +8,9 @@ <source>lgpl.txt</source> </file> <file> + <source>release-notes.txt</source> + </file> + <file> <source>readme-ui.txt</source> <destName>readme.txt</destName> </file> @@ -23,7 +26,6 @@ <include>org.richfaces.core:richfaces-core-api</include> <include>org.richfaces.core:richfaces-core-impl</include> <include>org.richfaces.commons:richfaces-commons-api</include> - <!--<include>org.richfaces.ui.components:core-ui</include>--> </includes> <sources> @@ -59,6 +61,38 @@ <moduleSet> <includeSubModules>true</includeSubModules> <includes> + <include>org.richfaces.ui:richfaces-ui</include> + </includes> + + <sources> + <outputDirectoryMapping>/</outputDirectoryMapping> + <excludeSubModuleDirectories>true</excludeSubModuleDirectories> + <fileSets> + <fileSet> + <directory>target/apidocs</directory> + <outputDirectory>docs/javadocs/richfaces-ui</outputDirectory> + </fileSet> + <fileSet> + <directory>target</directory> + <includes> + <include>*-sources.jar</include> + </includes> + <outputDirectory>artifacts/ui/</outputDirectory> + </fileSet> + </fileSets> + </sources> + + <binaries> + <includeDependencies>false</includeDependencies> + <outputDirectory>artifacts/ui</outputDirectory> + <outputFileNameMapping>${module.artifactId}-${module.version}.${module.extension}</outputFileNameMapping> + <unpack>false</unpack> + </binaries> + </moduleSet> + + <moduleSet> + <includeSubModules>true</includeSubModules> + <includes> <include>org.richfaces.examples:core-demo</include> <include>org.richfaces.examples:richfaces-showcase</include> </includes> @@ -72,12 +106,6 @@ <include>src/**</include> <include>readme.txt</include> <include>pom.xml</include> - -<!-- - <include>build.xml</include> - <include>maven-build.properties</include> - <include>maven-build.xml</include> ---> </includes> </fileSet> </fileSets> Modified: root/pom.xml =================================================================== --- root/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -30,9 +30,9 @@ <modules> <!-- These trunk settings, and this pom.xml will be removed --> <!-- Added bom, parent, for temp integration --> - <module>build/parent/trunk</module> + <module>build/parent/tags/richfaces-parent-1</module> <module>build/bom/trunk</module> - <module>build/resources/trunk/checkstyle</module> + <!--<module>build/resources/trunk/checkstyle</module>--> <module>commons/${commons.svn.dir}</module> <module>core/${core.svn.dir}</module> <module>cdk/${cdk.svn.dir}</module> Modified: root/ui/core/trunk/parent/pom.xml =================================================================== --- root/ui/core/trunk/parent/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui/core/trunk/parent/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -36,6 +36,10 @@ <name>Richfaces UI Components: Core Parent</name> <packaging>pom</packaging> + <properties> + <richfaces.checkstyle.version>1</richfaces.checkstyle.version> + </properties> + <dependencyManagement> <dependencies> <dependency> @@ -84,6 +88,17 @@ <plugins> <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-build-checkstyle</artifactId> + <version>${richfaces.checkstyle.version}</version> + </dependency> + </dependencies> + </plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>1.0-beta-1</version> @@ -91,6 +106,7 @@ <fail>false</fail> </configuration> </plugin> + <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> @@ -117,4 +133,47 @@ </plugins> </build> + <profiles> + <profile> + <id>release</id> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <javadocVersion>1.5</javadocVersion> + <aggregate>true</aggregate> + </configuration> + <executions> + <execution> + <id>generate-javadoc</id> + <phase>generate-sources</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <configuration> + <aggregate>true</aggregate> + </configuration> + <executions> + <execution> + <id>generate-source</id> + <phase>generate-sources</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: root/ui/core/trunk/pom.xml =================================================================== --- root/ui/core/trunk/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui/core/trunk/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -41,71 +41,4 @@ <module>parent</module> <module>api</module> </modules> - - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - </plugin> - - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <configuration> - <fail>false</fail> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>release</id> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <javadocVersion>1.5</javadocVersion> - <aggregate>true</aggregate> - </configuration> - <executions> - <execution> - <id>generate-javadoc</id> - <phase>generate-sources</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <configuration> - <aggregate>true</aggregate> - </configuration> - <executions> - <execution> - <id>generate-source</id> - <phase>generate-sources</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project> \ No newline at end of file Modified: root/ui/dist/trunk/assembler.xml =================================================================== --- root/ui/dist/trunk/assembler.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui/dist/trunk/assembler.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -0,0 +1,28 @@ +<assembly> + <formats> + <format>dir</format> + </formats> + + <moduleSets> + <moduleSet> + <includeSubModules>true</includeSubModules> + <includes> + <include>org.richfaces.ui:richfaces-ui-core-api</include> + <include>org.richfaces.ui-sandbox:tables-api</include> + <include>org.richfaces.ui-sandbox:tables-ui</include> + <include>org.richfaces.ui-sandbox:tables-impl</include> + </includes> + + <sources> + <outputDirectoryMapping>/</outputDirectoryMapping> + <excludeSubModuleDirectories>true</excludeSubModuleDirectories> + <fileSets> + <fileSet> + <directory>src/main/java</directory> + <outputDirectory>sources</outputDirectory> + </fileSet> + </fileSets> + </sources> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Modified: root/ui/dist/trunk/pom.xml =================================================================== --- root/ui/dist/trunk/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui/dist/trunk/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -0,0 +1,55 @@ +<?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>1</version> + </parent> + + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-assembler</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Richfaces UI Assembler</name> + + <modules> + <module>../../core/trunk</module> + <module>../../../ui-sandbox/tables/trunk</module> + <module>richfaces-ui</module> + </modules> + + <build> + <plugins> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file Added: root/ui/dist/trunk/richfaces-ui/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-ui/pom.xml (rev 0) +++ root/ui/dist/trunk/richfaces-ui/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -0,0 +1,206 @@ +<?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>1</version> + </parent> + + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Richfaces UI</name> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-core-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</groupId> + <artifactId>richfaces-ui-core-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui-sandbox</groupId> + <artifactId>tables-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui-sandbox</groupId> + <artifactId>tables-impl</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui-sandbox</groupId> + <artifactId>tables-ui</artifactId> + </dependency> + + <!-- for javadoc generation --> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.commons</groupId> + <artifactId>richfaces-commons-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </dependency> + + <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> + + <!-- tests --> + <dependency> + <!-- todo api? --> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-test-stage</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> + <artifactId>maven-shade-plugin</artifactId> + <version>1.3.3</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <includes> + <include>org.richfaces.ui:*</include> + <include>org.richfaces.ui-sandbox:*</include> + </includes> + </artifactSet> + <finalName>richfaces-ui-${project.version}</finalName> + <createSourcesJar>true</createSourcesJar> + </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> + <!-- 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> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Modified: root/ui-sandbox/componentcontrol/trunk/pom.xml =================================================================== --- root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -26,9 +26,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>components</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1</version> </parent> <groupId>org.richfaces.ui-sandbox</groupId> Modified: root/ui-sandbox/datascroller/trunk/pom.xml =================================================================== --- root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -26,9 +26,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>components</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1</version> </parent> <groupId>org.richfaces.ui-sandbox</groupId> Modified: root/ui-sandbox/pom.xml =================================================================== --- root/ui-sandbox/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui-sandbox/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -40,77 +40,4 @@ <module>datascroller/trunk</module> <module>componentcontrol/trunk</module> </modules> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - </dependencies> - </dependencyManagement> - - <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> - <artifactId>maven-cdk-plugin</artifactId> - <version>4.0.0-SNAPSHOT</version> - <executions> - <execution> - <id>generate</id> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - <inherited>true</inherited> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ --> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <configuration> - <fail>false</fail> - </configuration> - </plugin> - </plugins> - </build> </project> \ No newline at end of file Modified: root/ui-sandbox/tables/trunk/pom.xml =================================================================== --- root/ui-sandbox/tables/trunk/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui-sandbox/tables/trunk/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -24,9 +24,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>components</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1</version> </parent> <groupId>org.richfaces.ui-sandbox</groupId>