Author: Alex.Kolonitsky Date: 2009-08-27 05:43:15 -0400 (Thu, 27 Aug 2009) New Revision: 15335 Added: root/examples/trunk/components/core-demo/readme.txt root/examples/trunk/richfaces-demo/readme.txt Modified: root/examples/trunk/components/core-demo/pom.xml root/examples/trunk/richfaces-demo/pom.xml root/pom.xml root/richfaces-examples.xml root/richfaces.xml Log: Update 4.0 ALPHA1 assembler for new structure https://jira.jboss.org/jira/browse/RF-7745 Modified: root/examples/trunk/components/core-demo/pom.xml =================================================================== --- root/examples/trunk/components/core-demo/pom.xml 2009-08-27 01:35:29 UTC (rev 15334) +++ root/examples/trunk/components/core-demo/pom.xml 2009-08-27 09:43:15 UTC (rev 15335) @@ -10,6 +10,10 @@ <version>4.0.0-SNAPSHOT</version> </parent> + <properties> + <example.componentName>core</example.componentName> + </properties> + <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.examples.components</groupId> <artifactId>${example.componentName}-demo</artifactId> @@ -45,8 +49,29 @@ </dependency> </dependencies> - <properties> - <example.componentName>core</example.componentName> - </properties> + <profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-ant-plugin</artifactId> + <version>2.2</version> + + <executions> + <execution> + <id>ant</id> + <phase>generate-sources</phase> + <goals> + <goal>ant</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> \ No newline at end of file Added: root/examples/trunk/components/core-demo/readme.txt =================================================================== Modified: root/examples/trunk/richfaces-demo/pom.xml =================================================================== --- root/examples/trunk/richfaces-demo/pom.xml 2009-08-27 01:35:29 UTC (rev 15334) +++ root/examples/trunk/richfaces-demo/pom.xml 2009-08-27 09:43:15 UTC (rev 15335) @@ -14,38 +14,60 @@ <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-demo</artifactId> <packaging>war</packaging> - <name>richfaces demo application </name> + <name>richfaces demo application </name> -<dependencies> - <dependency> - <groupId>org.richfaces.ui.components</groupId> - <artifactId>core-ui</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>3.1.0.GA</version> - </dependency> - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - <version>1.6.0</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.8</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.8</version> - <scope>provided</scope> - </dependency> - </dependencies> +<dependencies> + <dependency> + <groupId>org.richfaces.ui.components</groupId> + <artifactId>core-ui</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.1.0.GA</version> + </dependency> + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + <version>1.6.0</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.8</version> + <scope>provided</scope> + </dependency> + </dependencies> - + <profiles> + <profile> + <id>release</id> -</project> + <build> + <plugins> + <plugin> + <artifactId>maven-ant-plugin</artifactId> + <version>2.2</version> + + <executions> + <execution> + <id>ant</id> + <phase>generate-sources</phase> + <goals> + <goal>ant</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> Added: root/examples/trunk/richfaces-demo/readme.txt =================================================================== Modified: root/pom.xml =================================================================== --- root/pom.xml 2009-08-27 01:35:29 UTC (rev 15334) +++ root/pom.xml 2009-08-27 09:43:15 UTC (rev 15335) @@ -72,6 +72,21 @@ </execution> </executions> </plugin> + + <plugin> + <artifactId>maven-ant-plugin</artifactId> + <version>2.2</version> + + <executions> + <execution> + <id>ant</id> + <phase>generate-sources</phase> + <goals> + <goal>ant</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </profile> Modified: root/richfaces-examples.xml =================================================================== --- root/richfaces-examples.xml 2009-08-27 01:35:29 UTC (rev 15334) +++ root/richfaces-examples.xml 2009-08-27 09:43:15 UTC (rev 15335) @@ -6,6 +6,8 @@ <files> <file> <source>lgpl.txt</source> + </file> + <file> <source>JBossORG-EULA.txt</source> </file> </files> @@ -14,6 +16,7 @@ <moduleSet> <includeSubModules>true</includeSubModules> <includes> + <include>org.richfaces.examples:components</include> <include>org.richfaces.examples:richfaces-demo</include> <!--<include>org.richfaces.examples:photoalbum</include>--> </includes> @@ -25,7 +28,12 @@ <fileSet> <includes> <include>src/**</include> - <include>pom.xml</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> @@ -54,20 +62,34 @@ <fileSet> <includes> <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> </sources> + </moduleSet> + + <moduleSet> + <includeSubModules>true</includeSubModules> + <includes> + <include>org.richfaces:examples</include> + </includes> - <!-- - <binaries> - <outputDirectory>components/${module.artifactId}</outputDirectory> - <includeDependencies>false</includeDependencies> - <unpack>false</unpack> - <outputFileNameMapping>${module.artifactId}-${module.version}.${module.extension}</outputFileNameMapping> - </binaries> - --> + <sources> + <outputDirectoryMapping /> + <fileSets> + <fileSet> + <includes> + <include>pom.xml</include> + </includes> + </fileSet> + </fileSets> + </sources> </moduleSet> </moduleSets> </assembly> \ No newline at end of file Modified: root/richfaces.xml =================================================================== --- root/richfaces.xml 2009-08-27 01:35:29 UTC (rev 15334) +++ root/richfaces.xml 2009-08-27 09:43:15 UTC (rev 15335) @@ -6,6 +6,8 @@ <files> <file> <source>lgpl.txt</source> + </file> + <file> <source>JBossORG-EULA.txt</source> </file> </files> @@ -31,11 +33,8 @@ <outputDirectory>/lib/source</outputDirectory> </fileSet> <fileSet> - <directory>target</directory> - <includes> - <include>*-javadoc.jar</include> - </includes> - <outputDirectory>/java-doc</outputDirectory> + <directory>target/apidocs</directory> + <outputDirectory>/java-doc/${module.artifactId}</outputDirectory> </fileSet> </fileSets> </sources>