[richfaces-svn-commits] JBoss Rich Faces SVN: r14745 - in branches/sandbox/rf4_build: cdk/trunk and 9 other directories.

Author: abelevich Date: 2009-06-29 14:55:35 -0400 (Mon, 29 Jun 2009) New Revision: 14745 Added: branches/sandbox/rf4_build/framework/trunk/version-matrix/ branches/sandbox/rf4_build/framework/trunk/version-matrix/pom.xml branches/sandbox/rf4_build/ui/trunk/version-matrix/ branches/sandbox/rf4_build/ui/trunk/version-matrix/pom.xml Removed: branches/sandbox/rf4_build/version-matrix/ Modified: branches/sandbox/rf4_build/cdk/trunk/pom.xml branches/sandbox/rf4_build/examples/trunk/components/pom.xml branches/sandbox/rf4_build/examples/trunk/components/tree-demo/pom.xml branches/sandbox/rf4_build/examples/trunk/pom.xml branches/sandbox/rf4_build/framework/trunk/pom.xml branches/sandbox/rf4_build/make.sh branches/sandbox/rf4_build/ui/trunk/components/panel/pom.xml branches/sandbox/rf4_build/ui/trunk/components/pom.xml branches/sandbox/rf4_build/ui/trunk/pom.xml Log: new build system Modified: branches/sandbox/rf4_build/cdk/trunk/pom.xml =================================================================== --- branches/sandbox/rf4_build/cdk/trunk/pom.xml 2009-06-29 15:19:54 UTC (rev 14744) +++ branches/sandbox/rf4_build/cdk/trunk/pom.xml 2009-06-29 18:55:35 UTC (rev 14745) @@ -4,20 +4,35 @@ 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>version-matrix</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>cdk</artifactId> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>plugins</module> <module>archetypes</module> </modules> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xml-maven-plugin</artifactId> + <version>1.0-beta-2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-archetype-plugin</artifactId> + <version>2.0-alpha-4</version> + <extensions>true</extensions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: branches/sandbox/rf4_build/examples/trunk/components/pom.xml =================================================================== --- branches/sandbox/rf4_build/examples/trunk/components/pom.xml 2009-06-29 15:19:54 UTC (rev 14744) +++ branches/sandbox/rf4_build/examples/trunk/components/pom.xml 2009-06-29 18:55:35 UTC (rev 14745) @@ -28,6 +28,11 @@ <artifactId>${example.componentName}-ui</artifactId> <version>${ui.version}</version> </dependency> + <dependency> + <groupId>org.richfaces.ui.components</groupId> + <artifactId>${example.componentName}Model-ui</artifactId> + <version>${ui.version}</version> + </dependency> </dependencies> </dependencyManagement> Modified: branches/sandbox/rf4_build/examples/trunk/components/tree-demo/pom.xml =================================================================== --- branches/sandbox/rf4_build/examples/trunk/components/tree-demo/pom.xml 2009-06-29 15:19:54 UTC (rev 14744) +++ branches/sandbox/rf4_build/examples/trunk/components/tree-demo/pom.xml 2009-06-29 18:55:35 UTC (rev 14745) @@ -20,6 +20,10 @@ <groupId>org.richfaces.ui.components</groupId> <artifactId>${example.componentName}-ui</artifactId> </dependency> + <dependency> + <groupId>org.richfaces.ui.components</groupId> + <artifactId>${example.componentName}Model-ui</artifactId> + </dependency> </dependencies> <properties> Modified: branches/sandbox/rf4_build/examples/trunk/pom.xml =================================================================== --- branches/sandbox/rf4_build/examples/trunk/pom.xml 2009-06-29 15:19:54 UTC (rev 14744) +++ branches/sandbox/rf4_build/examples/trunk/pom.xml 2009-06-29 18:55:35 UTC (rev 14745) @@ -4,17 +4,13 @@ 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>version-matrix</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>examples</artifactId> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> + <properties> <jsf.version>2.0.0-PR2_3</jsf.version> <framework.version>${project.version}</framework.version> @@ -24,11 +20,6 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - <version>${framework.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> <version>${framework.version}</version> </dependency> Modified: branches/sandbox/rf4_build/framework/trunk/pom.xml =================================================================== --- branches/sandbox/rf4_build/framework/trunk/pom.xml 2009-06-29 15:19:54 UTC (rev 14744) +++ branches/sandbox/rf4_build/framework/trunk/pom.xml 2009-06-29 18:55:35 UTC (rev 14745) @@ -5,8 +5,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <groupId>org.richfaces</groupId> - <artifactId>version-matrix</artifactId> + <groupId>org.richfaces</groupId> + <artifactId>framework-version-matrix</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> @@ -14,6 +14,27 @@ <groupId>org.richfaces</groupId> <artifactId>framework</artifactId> <packaging>pom</packaging> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>${framework.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${framework.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-test-base</artifactId> + <version>${framework.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + </dependencyManagement> <dependencies> <dependency> Added: branches/sandbox/rf4_build/framework/trunk/version-matrix/pom.xml =================================================================== --- branches/sandbox/rf4_build/framework/trunk/version-matrix/pom.xml (rev 0) +++ branches/sandbox/rf4_build/framework/trunk/version-matrix/pom.xml 2009-06-29 18:55:35 UTC (rev 14745) @@ -0,0 +1,193 @@ +<?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"> + + <scm> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/<... + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/</conne... + <url>http://fisheye.jboss.org/browse/RichFaces</url> + </scm> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>framework-version-matrix</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <properties> + <jsf.version>2.0.0-PR2_3</jsf.version> + <framework.version>${project.version}</framework.version> + <cdk.version>${project.version}</cdk.version> + </properties> + + <repositories> + <repository> + <id>repository.jboss.org</id> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + <url>http://repository.jboss.org/maven2</url> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <url>http://snapshots.jboss.org/maven2</url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>repository.jboss.org</id> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + <url>http://repository.jboss.org/maven2</url> + </pluginRepository> + <pluginRepository> + <id>snapshots.jboss.org</id> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <url>http://snapshots.jboss.org/maven2</url> + </pluginRepository> + </pluginRepositories> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>${jsf.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>${jsf.version}</version> + <scope>provided</scope> + </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> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jstl</groupId> + <artifactId>jstl</artifactId> + <version>1.2</version> + <scope>provided</scope> + </dependency> + <!-- end --> + + <!-- Archetypes dependency --> + <!-- start --> + <dependency> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.0-alpha-4</version> + </dependency> + <!-- end --> + </dependencies> + </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xml-maven-plugin</artifactId> + <version>1.0-beta-2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-archetype-plugin</artifactId> + <version>2.0-alpha-4</version> + <extensions>true</extensions> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <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> + + +</project> \ No newline at end of file Modified: branches/sandbox/rf4_build/make.sh =================================================================== --- branches/sandbox/rf4_build/make.sh 2009-06-29 15:19:54 UTC (rev 14744) +++ branches/sandbox/rf4_build/make.sh 2009-06-29 18:55:35 UTC (rev 14745) @@ -2,16 +2,38 @@ PROJECT_DIR=`pwd` TAG_DIR='trunk' +VERSION_MATRIX='version-matrix' settings=$PROJECT_DIR/settings.xml case "`uname`" in CYGWIN*) settings=`cygpath -w $settings` ;; esac -for MODULE in 'version-matrix' 'cdk' 'framework' 'ui' 'docs' 'examples' + +for MODULE in 'framework' 'ui' do echo + echo -e "\033[40m\033[1;32m---------------------------------\033[0m" + echo -e "\033[40m\033[1;32mMaking $MODULE/$TAG_DIR/version-matrix \033[0m" echo -e "\033[40m\033[1;32m---------------------------------\033[0m" + echo + + cd $PROJECT_DIR/$MODULE/$TAG_DIR/$VERSION_MATRIX + + if mvn -s $settings clean install; then + echo + else + exit $? + fi + +done + + +for MODULE in 'cdk' 'framework' 'ui' 'docs' 'examples' + +do + echo + echo -e "\033[40m\033[1;32m---------------------------------\033[0m" echo -e "\033[40m\033[1;32mMaking $MODULE/$TAG_DIR \033[0m" echo -e "\033[40m\033[1;32m---------------------------------\033[0m" echo Modified: branches/sandbox/rf4_build/ui/trunk/components/panel/pom.xml =================================================================== --- branches/sandbox/rf4_build/ui/trunk/components/panel/pom.xml 2009-06-29 15:19:54 UTC (rev 14744) +++ branches/sandbox/rf4_build/ui/trunk/components/panel/pom.xml 2009-06-29 18:55:35 UTC (rev 14745) @@ -6,9 +6,9 @@ <parent> <groupId>org.richfaces.ui</groupId> - <artifactId>components</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> + <artifactId>components</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui.components</groupId> Modified: branches/sandbox/rf4_build/ui/trunk/components/pom.xml =================================================================== --- branches/sandbox/rf4_build/ui/trunk/components/pom.xml 2009-06-29 15:19:54 UTC (rev 14744) +++ branches/sandbox/rf4_build/ui/trunk/components/pom.xml 2009-06-29 18:55:35 UTC (rev 14745) @@ -12,9 +12,21 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> + <artifactId>components</artifactId> <packaging>pom</packaging> - + <!--dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>${framework.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-test-base</artifactId> + <version>${framework.version}</version> + <scope>test</scope> + </dependency> + </dependencies--> <modules> <module>panel</module> <module>tree</module> Modified: branches/sandbox/rf4_build/ui/trunk/pom.xml =================================================================== --- branches/sandbox/rf4_build/ui/trunk/pom.xml 2009-06-29 15:19:54 UTC (rev 14744) +++ branches/sandbox/rf4_build/ui/trunk/pom.xml 2009-06-29 18:55:35 UTC (rev 14745) @@ -4,23 +4,22 @@ 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>version-matrix</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.richfaces</groupId> + <artifactId>ui-version-matrix</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>ui</artifactId> <packaging>pom</packaging> - - <build> + + <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>${cdk.version}</version> <executions> <execution> <phase>generate-sources</phase> @@ -72,11 +71,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test-base</artifactId> + <scope> test </scope> </dependency> </dependencies> <modules> - <module>components</module> + <module>components</module> <module>skins</module> <module>themes</module> </modules> Added: branches/sandbox/rf4_build/ui/trunk/version-matrix/pom.xml =================================================================== --- branches/sandbox/rf4_build/ui/trunk/version-matrix/pom.xml (rev 0) +++ branches/sandbox/rf4_build/ui/trunk/version-matrix/pom.xml 2009-06-29 18:55:35 UTC (rev 14745) @@ -0,0 +1,204 @@ +<?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"> + + <scm> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/<... + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/</conne... + <url>http://fisheye.jboss.org/browse/RichFaces</url> + </scm> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>ui-version-matrix</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <properties> + <jsf.version>2.0.0-PR2_3</jsf.version> + <ui.version>${project.version}</ui.version> + <framework.version>${project.version}</framework.version> + <cdk.version>${project.version}</cdk.version> + </properties> + + <repositories> + <repository> + <id>repository.jboss.org</id> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + <url>http://repository.jboss.org/maven2</url> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <url>http://snapshots.jboss.org/maven2</url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>repository.jboss.org</id> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + <url>http://repository.jboss.org/maven2</url> + </pluginRepository> + <pluginRepository> + <id>snapshots.jboss.org</id> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <url>http://snapshots.jboss.org/maven2</url> + </pluginRepository> + </pluginRepositories> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>${framework.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-test-base</artifactId> + <version>${framework.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>${jsf.version}</version> + <scope>provided</scope> + </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> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jstl</groupId> + <artifactId>jstl</artifactId> + <version>1.2</version> + <scope>provided</scope> + </dependency> + <!-- end --> + + <!-- Archetypes dependency --> + <!-- start --> + <dependency> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.0-alpha-4</version> + </dependency> + <!-- end --> + </dependencies> + </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>${cdk.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xml-maven-plugin</artifactId> + <version>1.0-beta-2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-archetype-plugin</artifactId> + <version>2.0-alpha-4</version> + <extensions>true</extensions> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <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> + <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> + </plugins> + </build> + +</project> \ No newline at end of file