Author: Alex.Kolonitsky Date: 2010-05-31 08:48:32 -0400 (Mon, 31 May 2010) New Revision: 17405 Modified: root/core/trunk/impl/pom.xml root/dist/trunk/pom.xml root/dist/trunk/richfaces.xml root/pom.xml Log: root assembler Modified: root/core/trunk/impl/pom.xml =================================================================== --- root/core/trunk/impl/pom.xml 2010-05-31 12:43:31 UTC (rev 17404) +++ root/core/trunk/impl/pom.xml 2010-05-31 12:48:32 UTC (rev 17405) @@ -135,22 +135,7 @@ <build> <plugins> - <!-- Trigger checkstyle checking for this module --> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <!-- - TODO should be in profile not here. The path in profile - is correct - --> - <plugin> - <!-- Configure js documentation plugin --> - <groupId>gr.abiss.mvn.plugins</groupId> - <artifactId>maven-jstools-plugin</artifactId> - </plugin> - - <!-- TODO Centralize this because calendar and context menu use this too Note: This may be removed by redisgn @@ -216,6 +201,23 @@ </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/site/jsdoc</classesDirectory> + <classifier>jsdoc</classifier> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </profile> Modified: root/dist/trunk/pom.xml =================================================================== --- root/dist/trunk/pom.xml 2010-05-31 12:43:31 UTC (rev 17404) +++ root/dist/trunk/pom.xml 2010-05-31 12:48:32 UTC (rev 17405) @@ -37,17 +37,67 @@ <modules> <!--<module>../../build/parent/tags/richfaces-parent-3</module>--> - <module>../../build/bom/trunk</module> - <module>../../commons/trunk</module> - <module>../../core/trunk</module> + <!--<module>../../build/bom/trunk</module>--> + <module>../../archetypes</module> + + <!--<module>../../commons/trunk</module>--> + <!--<module>../../core/trunk</module>--> <!-- call ui assembler --> - <module>../../ui/dist/trunk</module> + <!--<module>../../ui/dist/trunk</module>--> <!-- for build examples we need some components from sandbox --> <module>../../examples</module> </modules> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-api</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-impl</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.commons</groupId> + <artifactId>richfaces-commons-api</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + + <!-- Examples --> + <dependency> + <groupId>org.richfaces.examples</groupId> + <artifactId>core-demo</artifactId> + <version>4.0.0-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.richfaces.examples</groupId> + <artifactId>richfaces-showcase</artifactId> + <version>4.0.0-SNAPSHOT</version> + <type>war</type> + <classifier>tomcat6</classifier> + </dependency> + </dependencies> + <build> <plugins> <plugin> @@ -56,7 +106,77 @@ <skip>true</skip> </configuration> </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <includeGroupIds>org.richfaces.core,org.richfaces.commons,org.richfaces.ui</includeGroupIds> + </configuration> + <executions> + <execution> + <id>copy-bin</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <phase>package</phase> + </execution> + <execution> + <id>copy-sources</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <phase>package</phase> + <configuration> + <classifier>sources</classifier> + </configuration> + </execution> + <execution> + <id>copy-javadoc</id> + <goals> + <goal>unpack-dependencies</goal> + </goals> + <phase>package</phase> + <configuration> + <classifier>javadoc</classifier> + + <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> + <stripVersion>true</stripVersion> + </configuration> + </execution> + <execution> + <id>copy-jsdoc</id> + <goals> + <goal>unpack-dependencies</goal> + </goals> + <phase>package</phase> + <configuration> + <classifier>jsdoc</classifier> + + <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact> + <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> + <stripVersion>true</stripVersion> + </configuration> + </execution> + +<!-- + <execution> + <id>copy-examples</id> + <goals> + <goal>unpack-dependencies</goal> + </goals> + <phase>package</phase> + <configuration> + <includeGroupIds>org.richfaces.examples</includeGroupIds> + <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact> + <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> + <stripVersion>true</stripVersion> + </configuration> + </execution> +--> + </executions> + </plugin> + + <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-4</version> <executions> @@ -72,7 +192,7 @@ </goals> </execution> </executions> - </plugin> + </plugin> </plugins> </build> </project> \ No newline at end of file Modified: root/dist/trunk/richfaces.xml =================================================================== --- root/dist/trunk/richfaces.xml 2010-05-31 12:43:31 UTC (rev 17404) +++ root/dist/trunk/richfaces.xml 2010-05-31 12:48:32 UTC (rev 17405) @@ -1,6 +1,8 @@ -<assembly> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> <formats> - <format>zip</format> + <format>dir</format> </formats> <files> @@ -23,90 +25,92 @@ </file> </files> - <moduleSets> - <moduleSet> - <includeSubModules>true</includeSubModules> + <fileSets> + <!-- bin & sources --> + <fileSet> + <directory>target/dependency</directory> + <outputDirectory>artifacts/framework</outputDirectory> <includes> - <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>richfaces-core-*.jar</include> + <include>richfaces-commons-*.jar</include> </includes> + </fileSet> + <fileSet> + <directory>target/dependency</directory> + <outputDirectory>artifacts/ui</outputDirectory> + <includes> + <include>richfaces-components-*.jar</include> + </includes> + </fileSet> - <sources> - <outputDirectoryMapping>/</outputDirectoryMapping> - <excludeSubModuleDirectories>true</excludeSubModuleDirectories> - <fileSets> - <fileSet> - <directory>target</directory> - <includes> - <include>*-sources.jar</include> - </includes> - <outputDirectory>artifacts/framework/</outputDirectory> - </fileSet> - <fileSet> - <directory>target/apidocs</directory> - <outputDirectory>docs/javadocs/${module.artifactId}</outputDirectory> - </fileSet> - <fileSet> - <directory>target/site/jsdoc</directory> - <outputDirectory>docs/jsdocs/${module.artifactId}</outputDirectory> - </fileSet> - </fileSets> - </sources> + <!-- javadocs --> + <fileSet> + <directory>target/dependency/richfaces-core-api-javadoc-java-source</directory> + <outputDirectory>docs/javadocs/richfaces-core-api/</outputDirectory> + </fileSet> + <fileSet> + <directory>target/dependency/richfaces-core-impl-javadoc-java-source</directory> + <outputDirectory>docs/javadocs/richfaces-core-impl/</outputDirectory> + </fileSet> + <fileSet> + <directory>target/dependency/richfaces-commons-api-javadoc-java-source</directory> + <outputDirectory>docs/javadocs/richfaces-commons-api/</outputDirectory> + </fileSet> + <fileSet> + <directory>target/dependency/richfaces-components-api-javadoc-java-source</directory> + <outputDirectory>docs/javadocs/richfaces-components-api/</outputDirectory> + </fileSet> + <fileSet> + <directory>target/dependency/richfaces-components-impl-javadoc-java-source</directory> + <outputDirectory>docs/javadocs/richfaces-components-impl/</outputDirectory> + </fileSet> + <fileSet> + <directory>target/dependency/richfaces-components-ui-javadoc-java-source</directory> + <outputDirectory>docs/javadocs/richfaces-components-ui/</outputDirectory> + </fileSet> - <binaries> - <includeDependencies>false</includeDependencies> - <outputDirectory>artifacts/framework</outputDirectory> - <outputFileNameMapping>${module.artifactId}-${module.version}.${module.extension}</outputFileNameMapping> - <unpack>false</unpack> - </binaries> - </moduleSet> + <!-- jsdoc --> + <fileSet> + <directory>target/dependency/richfaces-core-impl-jsdoc-java-source</directory> + <outputDirectory>docs/jsdoc/richfaces-core-impl/</outputDirectory> + </fileSet> + <fileSet> + <directory>target/dependency/richfaces-components-ui-jsdoc-java-source</directory> + <outputDirectory>docs/jsdoc/richfaces-components-ui/</outputDirectory> + </fileSet> + </fileSets> + <moduleSets> <moduleSet> <includeSubModules>true</includeSubModules> <includes> - <include>org.richfaces.ui:richfaces-components-*</include> + <include>org.richfaces.examples:core-demo</include> + <include>org.richfaces.examples:richfaces-showcase</include> </includes> <sources> - <outputDirectoryMapping>/</outputDirectoryMapping> - <excludeSubModuleDirectories>true</excludeSubModuleDirectories> + <outputDirectoryMapping>examples/${module.artifactId}</outputDirectoryMapping> + <excludeSubModuleDirectories>false</excludeSubModuleDirectories> <fileSets> <fileSet> - <directory>target/apidocs</directory> - <outputDirectory>docs/javadocs/${module.artifactId}</outputDirectory> - </fileSet> - <fileSet> - <directory>target/site/jsdoc</directory> - <outputDirectory>docs/jsdocs/${module.artifactId}</outputDirectory> - </fileSet> - <fileSet> - <directory>target</directory> <includes> - <include>*-sources.jar</include> + <include>src/**</include> + <include>readme.txt</include> + <include>pom.xml</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> + <include>org.richfaces.archetypes:*</include> </includes> <sources> - <outputDirectoryMapping>examples/${module.artifactId}</outputDirectoryMapping> + <outputDirectoryMapping>archetypes/${module.artifactId}</outputDirectoryMapping> <excludeSubModuleDirectories>false</excludeSubModuleDirectories> <fileSets> <fileSet> Modified: root/pom.xml =================================================================== --- root/pom.xml 2010-05-31 12:43:31 UTC (rev 17404) +++ root/pom.xml 2010-05-31 12:48:32 UTC (rev 17405) @@ -11,22 +11,6 @@ <packaging>pom</packaging> <name>Richfaces Aggregator</name> - <distributionManagement> - <downloadUrl> - http://labs.jboss.com/portal/jbossrichfaces/downloads - </downloadUrl> - <repository> - <id>jboss-releases-repository</id> - <uniqueVersion>false</uniqueVersion> - <url>${releaseRepository}</url> - </repository> - <snapshotRepository> - <id>jboss-snapshots-repository</id> - <uniqueVersion>true</uniqueVersion> - <url>${snapshotRepository}</url> - </snapshotRepository> - </distributionManagement> - <modules> <!-- These trunk settings, and this pom.xml will be removed --> <!-- Added bom, parent, for temp integration --> @@ -34,113 +18,35 @@ <module>build/bom/trunk</module> <!--<module>build/resources/trunk/checkstyle</module>--> <module>build/resources/trunk/faces-shade-transformers</module> - <module>commons/${commons.svn.dir}</module> - <module>core/${core.svn.dir}</module> - <module>cdk/${cdk.svn.dir}</module> + <module>commons/trunk</module> + <module>core/trunk</module> + <module>cdk/trunk</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/dist/${ui.dist.svn.dir}</module> + <module>ui/core/trunk</module> + <module>ui/iteration/trunk</module> + <module>ui/misc/trunk</module> + <module>ui/dist/trunk</module> <!--<module>ui-sandbox</module>--> <module>examples</module> <!--<module>doc/${doc.svn.dir}</module>--> - <module>archetypes</module> + <module>archetypes</module> </modules> - <properties> - <snapshotRepository> - dav:https://repository.jboss.org/nexus/content/repositories/snapshots/ - </snapshotRepository> - </properties> - <profiles> <profile> - <id>trunk</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <core.svn.dir>trunk</core.svn.dir> - <commons.svn.dir>trunk</commons.svn.dir> - <cdk.svn.dir>trunk</cdk.svn.dir> - <ui.core.svn.dir>trunk</ui.core.svn.dir> - <ui.misc.svn.dir>trunk</ui.misc.svn.dir> - <ui.dist.svn.dir>trunk</ui.dist.svn.dir> - <ui.iteration.svn.dir>trunk</ui.iteration.svn.dir> - <ui-sandbox.svn.dir>trunk</ui-sandbox.svn.dir> - <examples-sandbox.svn.dir>trunk</examples-sandbox.svn.dir> - <doc.svn.dir>trunk</doc.svn.dir> - </properties> - </profile> - - <profile> <id>sandbox</id> <modules> <module>ui-sandbox</module> - <module>examples-sandbox/${examples-sandbox.svn.dir}</module> + <module>examples-sandbox/trunk</module> </modules> </profile> - <profile> <id>release</id> - - <build> - <plugins> - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-4</version> - <executions> - <execution> - <configuration> - <finalName>richfaces-${version}</finalName> - <descriptor>richfaces.xml</descriptor> - </configuration> - <id>richfaces</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - <execution> - <configuration> - <finalName>richfaces-examples-${version}</finalName> - <descriptor>richfaces-examples.xml</descriptor> - </configuration> - <id>richfaces-examples</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <modules> + <module>dist/trunk</module> + </modules> </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>