Author: Alex.Kolonitsky Date: 2010-05-10 10:16:43 -0400 (Mon, 10 May 2010) New Revision: 16950 Added: root/examples/pom.xml Modified: root/commons/trunk/pom.xml root/core/trunk/pom.xml root/examples/repeater-demo/trunk/pom.xml root/pom.xml Log: change richfaces build structure https://community.jboss.org/wiki/RichFaces40BuildDirectoryStructure fix pom files Modified: root/commons/trunk/pom.xml =================================================================== --- root/commons/trunk/pom.xml 2010-05-10 13:33:14 UTC (rev 16949) +++ root/commons/trunk/pom.xml 2010-05-10 14:16:43 UTC (rev 16950) @@ -0,0 +1,352 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<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"> + + <!--<parent> + <groupId>org.richfaces</groupId> + <artifactId>commons-bom</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>version-matrix/pom.xml</relativePath> + </parent>--> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>commons-root</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Richfaces commons root</name> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties> + + <modules> + <module>api</module> + </modules> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.6</version> + </dependency> + <dependency> + <groupId>net.sourceforge.htmlunit</groupId> + <artifactId>htmlunit</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>net.sourceforge.htmlunit</groupId> + <artifactId>htmlunit-core-js</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>net.sourceforge.cssparser</groupId> + <artifactId>cssparser</artifactId> + <version>0.9.5</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>seam-mock</artifactId> + <version>3.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>net.sourceforge.nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>1.9.12</version> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.1</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>de.berlios.jsunit</groupId> + <artifactId>jsunit</artifactId> + <version>1.3</version> + </dependency> + + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.3-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version >1.5.8</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version >1.5.8</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version >1.5.8</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version >1.5.8</version> + </dependency> + + <!-- Dependencies of JSF 2.0 --> + <!-- Included because of http://jira.codehaus.org/browse/MNG-2205 --> + <!-- start --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + </dependency> + <!-- end --> + <dependency> + <groupId>com.sun.el</groupId> + <artifactId>el-ri</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> + </dependency> + + <!-- TODO: remove commons dependencies --> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <!-- --> + + <!-- TODO: legacy dependnecies --> + <dependency> + <groupId>opensymphony</groupId> + <artifactId>oscache</artifactId> + <version>2.3</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.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.5.2</version> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymockclassextension</artifactId> + <version>2.5.2</version> + </dependency> + + </dependencies> + </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <version>2.4</version> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + + <!-- TODO: change to the current CDK version --> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-javascript-plugin</artifactId> + <version>3.3.1.GA</version> + </plugin> + <!-- --> + + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + <version>2.5.1</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <index>true</index> + <manifest> + <addDefaultSpecificationEntries> + true + </addDefaultSpecificationEntries> + <addDefaultImplementationEntries> + true + </addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <mode>development</mode> + <Build-Number>${buildNumber}</Build-Number> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.0-beta-1</version> + <executions> + <execution> + <id>enforce-versions</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireMavenVersion> + <version>2.1.0</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-eclipse-plugin</artifactId> + <configuration> + <wtpversion>2.0</wtpversion> + <downloadSources>true</downloadSources> + </configuration> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>net.sourceforge.cssparser</groupId> + <artifactId>cssparser</artifactId> + <version>0.9.5</version> + </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> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +</project> + Modified: root/core/trunk/pom.xml =================================================================== --- root/core/trunk/pom.xml 2010-05-10 13:33:14 UTC (rev 16949) +++ root/core/trunk/pom.xml 2010-05-10 14:16:43 UTC (rev 16950) @@ -26,7 +26,6 @@ <modules> <module>version-matrix</module> - <module>commons</module> <module>api</module> <module>impl</module> </modules> Added: root/examples/pom.xml =================================================================== --- root/examples/pom.xml (rev 0) +++ root/examples/pom.xml 2010-05-10 14:16:43 UTC (rev 16950) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<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> + <groupId>org.richfaces.examples</groupId> + <artifactId>root</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>richfaces examples all module aggregator</name> + + <modules> + <module>core-demo/trunk</module> + <module>repeater-demo/trunk</module> + <module>richfaces-demo/trunk</module> + <!--<module>dist/trunk</module>--> + </modules> + + <properties> + <snapshotRepository> + dav:https://repository.jboss.org/nexus/content/repositories/snapshots/ + </snapshotRepository> + </properties> +</project> \ No newline at end of file Modified: root/examples/repeater-demo/trunk/pom.xml =================================================================== --- root/examples/repeater-demo/trunk/pom.xml 2010-05-10 13:33:14 UTC (rev 16949) +++ root/examples/repeater-demo/trunk/pom.xml 2010-05-10 14:16:43 UTC (rev 16950) @@ -31,8 +31,13 @@ </dependency> <dependency> <groupId>com.sun.faces</groupId> - <artifactId>mojarra-jsf-impl</artifactId> + <artifactId>jsf-api</artifactId> <version>2.0.3-SNAPSHOT</version> </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.3-SNAPSHOT</version> + </dependency> </dependencies> </project> \ No newline at end of file Modified: root/pom.xml =================================================================== --- root/pom.xml 2010-05-10 13:33:14 UTC (rev 16949) +++ root/pom.xml 2010-05-10 14:16:43 UTC (rev 16950) @@ -36,11 +36,12 @@ <module>build/bom/trunk</module> <module>build/parent/trunk</module> <module>build/resources/trunk/checkstyle</module> - <module>framework/${framework.svn.dir}</module> + <module>commons/${commons.svn.dir}</module> + <module>core/${core.svn.dir}</module> <module>cdk/${cdk.svn.dir}</module> <module>ui/${ui.svn.dir}</module> <!--<module>ui-sandbox/${ui-sandbox.svn.dir}</module>--> - <!--<module>examples/${examples.svn.dir}</module>--> + <module>examples</module> <!--<module>examples-sandbox/${examples-sandbox.svn.dir}</module>--> <!--<module>doc/${doc.svn.dir}</module>--> </modules> @@ -58,11 +59,11 @@ <activeByDefault>true</activeByDefault> </activation> <properties> - <framework.svn.dir>trunk</framework.svn.dir> + <core.svn.dir>trunk</core.svn.dir> + <commons.svn.dir>trunk</commons.svn.dir> <cdk.svn.dir>trunk</cdk.svn.dir> <ui.svn.dir>trunk</ui.svn.dir> <ui-sandbox.svn.dir>trunk</ui-sandbox.svn.dir> - <examples.svn.dir>trunk</examples.svn.dir> <examples-sandbox.svn.dir>trunk</examples-sandbox.svn.dir> <doc.svn.dir>trunk</doc.svn.dir> </properties>