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

Author: Alex.Kolonitsky Date: 2010-05-27 11:00:36 -0400 (Thu, 27 May 2010) New Revision: 17320 Added: root/ui/iteration/trunk/dist/ root/ui/iteration/trunk/dist/pom.xml root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/ root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/ root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml root/ui/misc/trunk/dist/ root/ui/misc/trunk/dist/pom.xml root/ui/misc/trunk/dist/richfaces-ui-misc-ui/ root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml Modified: root/dist/trunk/pom.xml root/examples-sandbox/trunk/components/tables/pom.xml root/examples/pom.xml root/pom.xml root/ui/core/trunk/api/pom.xml root/ui/dist/trunk/pom.xml root/ui/dist/trunk/richfaces-components-api/pom.xml root/ui/dist/trunk/richfaces-components-impl/pom.xml root/ui/dist/trunk/richfaces-components-ui/pom.xml root/ui/iteration/trunk/bom/pom.xml root/ui/iteration/trunk/datascroller/api/pom.xml root/ui/iteration/trunk/datascroller/pom.xml root/ui/iteration/trunk/datascroller/ui/pom.xml root/ui/misc/trunk/bom/pom.xml root/ui/misc/trunk/pom.xml Log: RF-8461 add iteration and misc to richfaces-components assembler Modified: root/dist/trunk/pom.xml =================================================================== --- root/dist/trunk/pom.xml 2010-05-27 14:55:42 UTC (rev 17319) +++ root/dist/trunk/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -43,6 +43,8 @@ <!-- call ui assembler --> <module>../../ui/dist/trunk</module> + <!-- for build examples we need some components from sandbox --> + <module>../../ui-sandbox/datascroller/trunk</module> <module>../../examples</module> </modules> Modified: root/examples/pom.xml =================================================================== --- root/examples/pom.xml 2010-05-27 14:55:42 UTC (rev 17319) +++ root/examples/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -119,13 +119,13 @@ <id>jee5</id> <dependencies> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: root/examples-sandbox/trunk/components/tables/pom.xml =================================================================== --- root/examples-sandbox/trunk/components/tables/pom.xml 2010-05-27 14:55:42 UTC (rev 17319) +++ root/examples-sandbox/trunk/components/tables/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -41,15 +41,15 @@ </dependencyManagement> <dependencies> - <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>datascroller-api</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>datascroller-ui</artifactId> - </dependency> <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>datascroller-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>datascroller-ui</artifactId> + </dependency> + <dependency> <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>tables-ui</artifactId> </dependency> @@ -78,12 +78,12 @@ <!-- JSF --> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> </dependency> <dependency> <groupId>javax.servlet</groupId> Modified: root/pom.xml =================================================================== --- root/pom.xml 2010-05-27 14:55:42 UTC (rev 17319) +++ root/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -28,29 +28,31 @@ </distributionManagement> <modules> - <!-- These trunk settings, and this pom.xml will be removed --> - <!-- Added bom, parent, for temp integration --> + <!-- These trunk settings, and this pom.xml will be removed --> + <!-- Added bom, parent, for temp integration --> <module>build/parent/tags/richfaces-parent-5</module> <module>build/bom/trunk</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> + <module>cdk/${cdk.svn.dir}</module> + + <!-- richfaces ui --> <module>ui/core/${ui.core.svn.dir}</module> <module>ui/iteration/${ui.iteration.svn.dir}</module> <module>ui/misc/${ui.misc.svn.dir}</module> + <!--<module>ui-sandbox</module>--> <module>examples</module> - <!--<module>examples-sandbox/${examples-sandbox.svn.dir}</module>--> <!--<module>doc/${doc.svn.dir}</module>--> </modules> - <properties> - <snapshotRepository> - dav:https://repository.jboss.org/nexus/content/repositories/snapshots/ - </snapshotRepository> - </properties> - + <properties> + <snapshotRepository> + dav:https://repository.jboss.org/nexus/content/repositories/snapshots/ + </snapshotRepository> + </properties> + <profiles> <profile> <id>trunk</id> @@ -72,10 +74,10 @@ <profile> <id>sandbox</id> - <modules> - <module>ui-sandbox</module> - <module>examples-sandbox/${examples-sandbox.svn.dir}</module> - </modules> + <modules> + <module>ui-sandbox</module> + <module>examples-sandbox/${examples-sandbox.svn.dir}</module> + </modules> </profile> <profile> @@ -85,13 +87,13 @@ <plugins> <plugin> <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> + <configuration> + <skip>true</skip> + </configuration> </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-4</version> + <version>2.2-beta-4</version> <executions> <execution> <configuration> @@ -120,20 +122,21 @@ </plugins> </build> </profile> - - <profile> - <id>sonar</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <sonar.jdbc.url>jdbc:mysql://localhost:3306/sonar?useUnicode=true&amp;characterEncoding=utf8</sonar.jdbc.url> - <sonar.jdbc.driver>com.mysql.jdbc.Driver</sonar.jdbc.driver> - <sonar.jdbc.username>sonar</sonar.jdbc.username> - <sonar.jdbc.password>sonar</sonar.jdbc.password> - <sonar.host.url>http://localhost:9000</sonar.host.url> - </properties> - </profile> + <profile> + <id>sonar</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <sonar.jdbc.url>jdbc:mysql://localhost:3306/sonar?useUnicode=true&amp;characterEncoding=utf8 + </sonar.jdbc.url> + <sonar.jdbc.driver>com.mysql.jdbc.Driver</sonar.jdbc.driver> + <sonar.jdbc.username>sonar</sonar.jdbc.username> + <sonar.jdbc.password>sonar</sonar.jdbc.password> + + <sonar.host.url>http://localhost:9000</sonar.host.url> + </properties> + </profile> </profiles> </project> \ No newline at end of file Modified: root/ui/core/trunk/api/pom.xml =================================================================== --- root/ui/core/trunk/api/pom.xml 2010-05-27 14:55:42 UTC (rev 17319) +++ root/ui/core/trunk/api/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -54,6 +54,7 @@ <dependency> <groupId>${jsf2.api.groupid}</groupId> <artifactId>${jsf2.api.artifactid}</artifactId> + <version>2.0.2</version><!-- TODO: remove this dependency it should inherited from perent poms --> <scope>provided</scope> </dependency> <dependency> Modified: root/ui/dist/trunk/pom.xml =================================================================== --- root/ui/dist/trunk/pom.xml 2010-05-27 14:55:42 UTC (rev 17319) +++ root/ui/dist/trunk/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -36,13 +36,9 @@ <name>Richfaces UI Assembler</name> <modules> - <module>../../core/trunk</module> - <module>../../misc/trunk</module> - <module>../../../ui-sandbox/tables/trunk</module> - <!-- aggregate modules --> <module>richfaces-components-api</module> - <module>richfaces-components-impl</module> + <!--<module>richfaces-components-impl</module>--> <module>richfaces-components-ui</module> </modules> @@ -54,44 +50,19 @@ <skip>true</skip> </configuration> </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-4</version> - <configuration> - <appendAssemblyId>false</appendAssemblyId> - <finalName>js</finalName> - <descriptor>assembler.xml</descriptor> - </configuration> - <executions> - <execution> - <id>collect-jsdocs</id> - <phase>process-sources</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>gr.abiss.mvn.plugins</groupId> - <artifactId>maven-jstools-plugin</artifactId> - <executions> - <execution> - <id>jsdoc</id> - <phase>prepare-package</phase> - <configuration> - <outputBaseDirectory>${basedir}/richfaces-components-ui/target/site</outputBaseDirectory> - <jsDir>${basedir}/target/js</jsDir> - <includes>**/*.js</includes> - <caseSensitive>true</caseSensitive> - </configuration> - <goals> - <goal>jsdoc</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> + <profiles> + <profile> + <id>build-force</id> + + <modules> + <module>../../core/trunk</module> + <module>../../misc/trunk/dist</module> + <module>../../iteration/trunk/dist</module> + </modules> + </profile> + </profiles> + </project> \ No newline at end of file Modified: root/ui/dist/trunk/richfaces-components-api/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-05-27 14:55:42 UTC (rev 17319) +++ root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -35,29 +35,26 @@ <packaging>jar</packaging> <name>Richfaces UI Components API</name> + <properties> + <assembly.projects.group>org.richfaces.ui</assembly.projects.group> + </properties> + <dependencyManagement> <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-api</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-api</artifactId> </dependency> <!-- for javadoc generation --> @@ -74,12 +71,12 @@ <artifactId>richfaces-commons-api</artifactId> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> </dependency> <dependency> <groupId>org.richfaces.cdk</groupId> @@ -111,34 +108,6 @@ <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> @@ -156,8 +125,7 @@ <configuration> <artifactSet> <includes> - <include>org.richfaces.ui:*</include> - <include>org.richfaces.ui-sandbox:*</include> + <include>${assembly.projects.group}:*</include> </includes> </artifactSet> <createSourcesJar>true</createSourcesJar> @@ -166,6 +134,26 @@ </executions> </plugin> <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> @@ -176,14 +164,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/dist/trunk/richfaces-components-impl/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-05-27 14:55:42 UTC (rev 17319) +++ root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -74,12 +74,12 @@ <artifactId>richfaces-commons-api</artifactId> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> </dependency> <dependency> <groupId>org.richfaces.cdk</groupId> Modified: root/ui/dist/trunk/richfaces-components-ui/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-05-27 14:55:42 UTC (rev 17319) +++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -35,6 +35,10 @@ <packaging>jar</packaging> <name>Richfaces UI Components UI</name> + <properties> + <assembly.projects.group>org.richfaces.ui</assembly.projects.group> + </properties> + <dependencyManagement> <dependencies> <dependency> @@ -45,15 +49,15 @@ <type>pom</type> </dependency> <dependency> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>tables-bom</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-misc-bom</artifactId> <version>${project.version}</version> <scope>import</scope> <type>pom</type> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-misc-bom</artifactId> + <artifactId>richfaces-ui-iteration-bom</artifactId> <version>${project.version}</version> <scope>import</scope> <type>pom</type> @@ -62,6 +66,7 @@ </dependencyManagement> <dependencies> + <!-- artifacts for aggregation --> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-core-api</artifactId> @@ -71,8 +76,8 @@ <artifactId>richfaces-ui-misc-ui</artifactId> </dependency> <dependency> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>tables-ui</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-ui</artifactId> </dependency> <!-- for javadoc generation --> @@ -89,12 +94,12 @@ <artifactId>richfaces-commons-api</artifactId> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> </dependency> <dependency> <groupId>org.richfaces.cdk</groupId> @@ -126,34 +131,6 @@ <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> @@ -181,6 +158,64 @@ </executions> </plugin> <plugin> + <!-- unpack necessary dependencies for collecting jsdoc and 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> + <!-- collecting jsdoc --> + <groupId>gr.abiss.mvn.plugins</groupId> + <artifactId>maven-jstools-plugin</artifactId> + <executions> + <execution> + <id>jsdoc</id> + <phase>prepare-package</phase> + <configuration> + <outputBaseDirectory>${basedir}/target</outputBaseDirectory> + <jsDir>${basedir}/target/dependency</jsDir> + <includes>**/*.js</includes> + <caseSensitive>true</caseSensitive> + </configuration> + <goals> + <goal>jsdoc</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <!-- pack jsdoc to jar --> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>pack-jsodcs</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classesDirectory>${basedir}/target/jsdoc</classesDirectory> + <classifier>jsdoc</classifier> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <!-- collecting javadoc --> <artifactId>maven-javadoc-plugin</artifactId> <version>2.7</version> <executions> @@ -191,14 +226,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-27 14:55:42 UTC (rev 17319) +++ root/ui/iteration/trunk/bom/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -51,6 +51,18 @@ </dependency> <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-api</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- TODO remove when shade plugin will be ready --> + <dependency> <groupId>org.richfaces.ui.iteration</groupId> <artifactId>datascroller-api</artifactId> <version>${project.version}</version> @@ -60,11 +72,6 @@ <artifactId>datascroller-ui</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-iteration-ui</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </dependencyManagement> </project> Modified: root/ui/iteration/trunk/datascroller/api/pom.xml =================================================================== --- root/ui/iteration/trunk/datascroller/api/pom.xml 2010-05-27 14:55:42 UTC (rev 17319) +++ root/ui/iteration/trunk/datascroller/api/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -36,17 +36,6 @@ <packaging>jar</packaging> <dependencies> - <!-- runtime --> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - <dependency> - <!-- todo remove this dependency or move to test scope --> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - </dependency> - <!-- JSF with dependencies --> <dependency> <groupId>${jsf2.api.groupid}</groupId> Modified: root/ui/iteration/trunk/datascroller/pom.xml =================================================================== --- root/ui/iteration/trunk/datascroller/pom.xml 2010-05-27 14:55:42 UTC (rev 17319) +++ root/ui/iteration/trunk/datascroller/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -29,7 +29,7 @@ <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> <version>5</version> - </parent> + </parent> <groupId>org.richfaces.ui.iteration</groupId> <artifactId>datascroller-aggregator</artifactId> Modified: root/ui/iteration/trunk/datascroller/ui/pom.xml =================================================================== --- root/ui/iteration/trunk/datascroller/ui/pom.xml 2010-05-27 14:55:42 UTC (rev 17319) +++ root/ui/iteration/trunk/datascroller/ui/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -37,7 +37,17 @@ <packaging>jar</packaging> <dependencies> + <!-- runtime --> <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + </dependency> + <dependency> + <!-- todo remove this dependency or move to test scope --> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + </dependency> + <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> <scope>provided</scope> @@ -46,6 +56,7 @@ <dependency> <groupId>org.richfaces.ui.iteration</groupId> <artifactId>datascroller-api</artifactId> + <version>${project.version}</version> </dependency> <!-- JSF with dependencies --> Added: root/ui/iteration/trunk/dist/pom.xml =================================================================== --- root/ui/iteration/trunk/dist/pom.xml (rev 0) +++ root/ui/iteration/trunk/dist/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -0,0 +1,43 @@ +<?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>5</version> + </parent> + + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-assembler</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Richfaces UI Iteration Assembler</name> + + <modules> + <!-- aggregate modules --> + <module>richfaces-ui-iteration-api</module> + <module>richfaces-ui-iteration-ui</module> + </modules> +</project> \ No newline at end of file Added: root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml =================================================================== --- root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml (rev 0) +++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -0,0 +1,146 @@ +<?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>5</version> + </parent> + + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-api</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> + </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>datascroller-api</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> + </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 Added: root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml =================================================================== --- root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml (rev 0) +++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -0,0 +1,182 @@ +<?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>5</version> + </parent> + + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-ui</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Richfaces UI Iteration UI</name> + + <properties> + <assembly.projects.group>org.richfaces.ui.iteration</assembly.projects.group> + </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>datascroller-ui</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> + </plugin> + </plugins> + </build> + <profiles> + <profile> + <id>release</id> + + <build> + <plugins> + <plugin> + <!-- unpack necessary dependencies for collecting jsdoc and 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> + <!-- collecting jsdoc --> + <groupId>gr.abiss.mvn.plugins</groupId> + <artifactId>maven-jstools-plugin</artifactId> + <executions> + <execution> + <id>jsdoc</id> + <phase>prepare-package</phase> + <configuration> + <outputBaseDirectory>${basedir}/target</outputBaseDirectory> + <jsDir>${basedir}/target/dependency</jsDir> + <includes>**/*.js</includes> + <caseSensitive>true</caseSensitive> + </configuration> + <goals> + <goal>jsdoc</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <!-- pack jsdoc to jar --> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>pack-jsodcs</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classesDirectory>${basedir}/target/jsdoc</classesDirectory> + <classifier>jsdoc</classifier> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <!-- collecting javadoc --> + <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 Modified: root/ui/misc/trunk/bom/pom.xml =================================================================== --- root/ui/misc/trunk/bom/pom.xml 2010-05-27 14:55:42 UTC (rev 17319) +++ root/ui/misc/trunk/bom/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -51,16 +51,6 @@ </dependency> <dependency> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>functions-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>componentcontrol-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-misc-ui</artifactId> <version>${project.version}</version> Added: root/ui/misc/trunk/dist/pom.xml =================================================================== --- root/ui/misc/trunk/dist/pom.xml (rev 0) +++ root/ui/misc/trunk/dist/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -0,0 +1,42 @@ +<?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>5</version> + </parent> + + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-assembler</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Richfaces UI Misc Assembler</name> + + <modules> + <!-- aggregate modules --> + <module>richfaces-ui-misc-ui</module> + </modules> +</project> \ No newline at end of file Added: root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml =================================================================== --- root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml (rev 0) +++ root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -0,0 +1,189 @@ +<?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>5</version> + </parent> + + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-misc-ui</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Richfaces UI Misc UI</name> + + <properties> + <assembly.projects.group>org.richfaces.ui.misc</assembly.projects.group> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-misc-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>componentcontrol-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${assembly.projects.group}</groupId> + <artifactId>functions-ui</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- artifacts for javadoc generation --> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>4.0.0-SNAPSHOT</version> + </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> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>release</id> + + <build> + <plugins> + <plugin> + <!-- unpack necessary dependencies for collecting jsdoc and 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> + <!-- collecting jsdoc --> + <groupId>gr.abiss.mvn.plugins</groupId> + <artifactId>maven-jstools-plugin</artifactId> + <executions> + <execution> + <id>jsdoc</id> + <phase>prepare-package</phase> + <configuration> + <outputBaseDirectory>${basedir}/target</outputBaseDirectory> + <jsDir>${basedir}/target/dependency</jsDir> + <includes>**/*.js</includes> + <caseSensitive>true</caseSensitive> + </configuration> + <goals> + <goal>jsdoc</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <!-- pack jsdoc to jar --> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>pack-jsodcs</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classesDirectory>${basedir}/target/jsdoc</classesDirectory> + <classifier>jsdoc</classifier> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <!-- collecting javadoc --> + <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 Modified: root/ui/misc/trunk/pom.xml =================================================================== --- root/ui/misc/trunk/pom.xml 2010-05-27 14:55:42 UTC (rev 17319) +++ root/ui/misc/trunk/pom.xml 2010-05-27 15:00:36 UTC (rev 17320) @@ -41,6 +41,9 @@ <module>parent</module> <module>functions</module> <module>componentcontrol</module> + + <!-- assembler --> + <module>dist</module> </modules> <build>