Author: nbelaevski Date: 2009-08-27 17:49:25 -0400 (Thu, 27 Aug 2009) New Revision: 15370 Modified: root/examples/trunk/components/core-demo/pom.xml root/examples/trunk/pom.xml root/examples/trunk/richfaces-demo/pom.xml root/pom.xml root/richfaces-examples.xml root/richfaces.xml Log: https://jira.jboss.org/jira/browse/RF-7775 https://jira.jboss.org/jira/browse/RF-7774 Modified: root/examples/trunk/components/core-demo/pom.xml =================================================================== --- root/examples/trunk/components/core-demo/pom.xml 2009-08-27 18:41:27 UTC (rev 15369) +++ root/examples/trunk/components/core-demo/pom.xml 2009-08-27 21:49:25 UTC (rev 15370) @@ -67,55 +67,5 @@ <scope>provided</scope> </dependency> </dependencies> - - <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> - - <profile> - <id>server</id> - - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.0.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>2.0.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> </project> \ No newline at end of file Modified: root/examples/trunk/pom.xml =================================================================== --- root/examples/trunk/pom.xml 2009-08-27 18:41:27 UTC (rev 15369) +++ root/examples/trunk/pom.xml 2009-08-27 21:49:25 UTC (rev 15370) @@ -89,18 +89,57 @@ <modules> <module>richfaces-demo</module> - <module>photoalbum</module> </modules> <profiles> <profile> + <id>photoalbum</id> + <modules> + <module>photoalbum</module> + </modules> + </profile> + <profile> <id>components</id> <modules> <module>components</module> </modules> </profile> - </profiles> - + <profile> + <id>jee5</id> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee5</webappDirectory> + <classifier>jee5</classifier> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <build> <plugins> <plugin> Modified: root/examples/trunk/richfaces-demo/pom.xml =================================================================== --- root/examples/trunk/richfaces-demo/pom.xml 2009-08-27 18:41:27 UTC (rev 15369) +++ root/examples/trunk/richfaces-demo/pom.xml 2009-08-27 21:49:25 UTC (rev 15370) @@ -65,53 +65,54 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-tomcat6</webappDirectory> + <classifier>tomcat6</classifier> + </configuration> + </plugin> + </plugins> + </build> + <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> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>jee5</id> + <phase>package</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee5</webappDirectory> + <classifier>jee5</classifier> + <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</packagingExcludes> + <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</warSourceExcludes> + </configuration> + </execution> + <execution> + <id>tomcat6</id> + <phase>package</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-tomcat6</webappDirectory> + <classifier>tomcat6</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> </profile> - - <profile> - <id>server</id> - - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.0.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>2.0.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> </profiles> </project> Modified: root/pom.xml =================================================================== --- root/pom.xml 2009-08-27 18:41:27 UTC (rev 15369) +++ root/pom.xml 2009-08-27 21:49:25 UTC (rev 15370) @@ -52,7 +52,6 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-4</version> - <executions> <execution> <configuration> @@ -78,21 +77,6 @@ </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 18:41:27 UTC (rev 15369) +++ root/richfaces-examples.xml 2009-08-27 21:49:25 UTC (rev 15370) @@ -16,7 +16,7 @@ <moduleSet> <includeSubModules>true</includeSubModules> <includes> - <include>org.richfaces.examples:components</include> + <!--include>org.richfaces.examples:components</include --> <include>org.richfaces.examples:richfaces-demo</include> <!--<include>org.richfaces.examples:photoalbum</include>--> </includes> @@ -49,7 +49,7 @@ --> </moduleSet> - <moduleSet> + <!-- moduleSet> <includeSubModules>true</includeSubModules> <includes> <include>org.richfaces.examples.components:core-demo</include> @@ -72,7 +72,7 @@ </fileSet> </fileSets> </sources> - </moduleSet> + </moduleSet --> <moduleSet> <includeSubModules>true</includeSubModules> Modified: root/richfaces.xml =================================================================== --- root/richfaces.xml 2009-08-27 18:41:27 UTC (rev 15369) +++ root/richfaces.xml 2009-08-27 21:49:25 UTC (rev 15370) @@ -34,7 +34,7 @@ </fileSet> <fileSet> <directory>target/apidocs</directory> - <outputDirectory>/java-doc/${module.artifactId}</outputDirectory> + <outputDirectory>/apidocs/${module.artifactId}</outputDirectory> </fileSet> </fileSets> </sources>