Author: Alex.Kolonitsky Date: 2010-05-25 10:54:22 -0400 (Tue, 25 May 2010) New Revision: 17235 Added: root/ui/dist/trunk/richfaces-components-api/ root/ui/dist/trunk/richfaces-components-api/pom.xml root/ui/dist/trunk/richfaces-components-impl/ root/ui/dist/trunk/richfaces-components-impl/pom.xml root/ui/dist/trunk/richfaces-components-ui/ Removed: root/ui/dist/trunk/richfaces-ui/ Modified: root/dist/trunk/richfaces.xml root/ui/dist/trunk/pom.xml root/ui/dist/trunk/richfaces-components-ui/pom.xml Log: RF-8461 split richfaces-ui to richfaces-components-api richfaces-components-impl richfaces-components-ui Modified: root/dist/trunk/richfaces.xml =================================================================== --- root/dist/trunk/richfaces.xml 2010-05-25 14:42:07 UTC (rev 17234) +++ root/dist/trunk/richfaces.xml 2010-05-25 14:54:22 UTC (rev 17235) @@ -41,7 +41,7 @@ <includes> <include>*-sources.jar</include> </includes> - <outputDirectory>artifacts/core/</outputDirectory> + <outputDirectory>artifacts/framework/</outputDirectory> </fileSet> <fileSet> <directory>target/apidocs</directory> @@ -56,7 +56,7 @@ <binaries> <includeDependencies>false</includeDependencies> - <outputDirectory>artifacts/core</outputDirectory> + <outputDirectory>artifacts/framework</outputDirectory> <outputFileNameMapping>${module.artifactId}-${module.version}.${module.extension}</outputFileNameMapping> <unpack>false</unpack> </binaries> @@ -65,7 +65,7 @@ <moduleSet> <includeSubModules>true</includeSubModules> <includes> - <include>org.richfaces.ui:richfaces-ui</include> + <include>org.richfaces.ui:richfaces-components-*</include> </includes> <sources> @@ -74,7 +74,7 @@ <fileSets> <fileSet> <directory>target/apidocs</directory> - <outputDirectory>docs/javadocs/richfaces-ui</outputDirectory> + <outputDirectory>docs/javadocs/${module.artifactId}</outputDirectory> </fileSet> <fileSet> <directory>target/site/jsdoc</directory> Modified: root/ui/dist/trunk/pom.xml =================================================================== --- root/ui/dist/trunk/pom.xml 2010-05-25 14:42:07 UTC (rev 17234) +++ root/ui/dist/trunk/pom.xml 2010-05-25 14:54:22 UTC (rev 17235) @@ -38,7 +38,11 @@ <modules> <module>../../core/trunk</module> <module>../../../ui-sandbox/tables/trunk</module> - <module>richfaces-ui</module> + + <!-- aggregate modules --> + <module>richfaces-components-api</module> + <module>richfaces-components-impl</module> + <module>richfaces-components-ui</module> </modules> <build> @@ -75,7 +79,7 @@ <id>jsdoc</id> <phase>prepare-package</phase> <configuration> - <outputBaseDirectory>${basedir}/richfaces-ui/target/site</outputBaseDirectory> + <outputBaseDirectory>${basedir}/richfaces-components-ui/target/site</outputBaseDirectory> <jsDir>${basedir}/target/js</jsDir> <includes>**/*.js</includes> <caseSensitive>true</caseSensitive> Added: root/ui/dist/trunk/richfaces-components-api/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-api/pom.xml (rev 0) +++ root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-05-25 14:54:22 UTC (rev 17235) @@ -0,0 +1,193 @@ +<?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-components-api</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Richfaces UI Components API</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-sandbox</groupId> + <artifactId>tables-api</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> + <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 Added: root/ui/dist/trunk/richfaces-components-impl/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-impl/pom.xml (rev 0) +++ root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-05-25 14:54:22 UTC (rev 17235) @@ -0,0 +1,193 @@ +<?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-components-impl</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Richfaces UI Components Impl</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-sandbox</groupId> + <artifactId>tables-impl</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> + <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 Copied: root/ui/dist/trunk/richfaces-components-ui (from rev 17224, root/ui/dist/trunk/richfaces-ui) Modified: root/ui/dist/trunk/richfaces-components-ui/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-ui/pom.xml 2010-05-24 22:53:25 UTC (rev 17224) +++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-05-25 14:54:22 UTC (rev 17235) @@ -30,10 +30,10 @@ </parent> <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> + <artifactId>richfaces-components-ui</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>jar</packaging> - <name>Richfaces UI</name> + <name>Richfaces UI Components UI</name> <dependencyManagement> <dependencies> @@ -61,14 +61,6 @@ </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> @@ -172,7 +164,6 @@ <include>org.richfaces.ui-sandbox:*</include> </includes> </artifactSet> - <finalName>richfaces-ui-${project.version}</finalName> <createSourcesJar>true</createSourcesJar> </configuration> </execution>