Author: nbelaevski Date: 2009-06-04 12:49:06 -0400 (Thu, 04 Jun 2009) New Revision: 14505 Added: branches/sandbox/rf4_build/framework/ branches/sandbox/rf4_build/framework/trunk/api/src/ branches/sandbox/rf4_build/framework/trunk/api/src/main/ branches/sandbox/rf4_build/framework/trunk/api/src/main/java/ branches/sandbox/rf4_build/framework/trunk/api/src/main/resources/ branches/sandbox/rf4_build/framework/trunk/api/src/test/ branches/sandbox/rf4_build/framework/trunk/api/src/test/java/ branches/sandbox/rf4_build/framework/trunk/api/src/test/resources/ branches/sandbox/rf4_build/framework/trunk/impl/src/ branches/sandbox/rf4_build/framework/trunk/impl/src/main/ branches/sandbox/rf4_build/framework/trunk/impl/src/main/java/ branches/sandbox/rf4_build/framework/trunk/impl/src/main/resources/ branches/sandbox/rf4_build/framework/trunk/impl/src/test/ branches/sandbox/rf4_build/framework/trunk/impl/src/test/java/ branches/sandbox/rf4_build/framework/trunk/impl/src/test/resources/ branches/sandbox/rf4_build/framework/trunk/test-base/ branches/sandbox/rf4_build/framework/trunk/test-base/src/ branches/sandbox/rf4_build/framework/trunk/test-base/src/main/ branches/sandbox/rf4_build/framework/trunk/test-base/src/main/java/ branches/sandbox/rf4_build/framework/trunk/test-base/src/main/resources/ branches/sandbox/rf4_build/framework/trunk/test-base/src/test/ branches/sandbox/rf4_build/framework/trunk/test-base/src/test/java/ branches/sandbox/rf4_build/framework/trunk/test-base/src/test/resources/ branches/sandbox/rf4_build/version-matrix/ branches/sandbox/rf4_build/version-matrix/trunk/ branches/sandbox/rf4_build/version-matrix/trunk/framework/ branches/sandbox/rf4_build/version-matrix/trunk/framework/pom.xml Removed: branches/sandbox/rf4_build/framework/trunk/test/ branches/sandbox/rf4_build/framework/trunk/version-matrix/ branches/sandbox/rf4_build/runtime/ Modified: branches/sandbox/rf4_build/framework/trunk/api/pom.xml branches/sandbox/rf4_build/framework/trunk/impl/pom.xml branches/sandbox/rf4_build/framework/trunk/pom.xml branches/sandbox/rf4_build/framework/trunk/test-base/pom.xml Log: Build system: 'runtime' renamed to 'framework' Copied: branches/sandbox/rf4_build/framework (from rev 14477, branches/sandbox/rf4_build/runtime) Modified: branches/sandbox/rf4_build/framework/trunk/api/pom.xml =================================================================== --- branches/sandbox/rf4_build/runtime/trunk/api/pom.xml 2009-06-04 12:48:56 UTC (rev 14477) +++ branches/sandbox/rf4_build/framework/trunk/api/pom.xml 2009-06-04 16:49:06 UTC (rev 14505) @@ -5,15 +5,14 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <groupId>org.richfaces.runtime</groupId> - <artifactId>version-matrix</artifactId> + <groupId>org.richfaces</groupId> + <artifactId>framework</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.runtime</groupId> - <artifactId>api</artifactId> - <packaging>jar</packaging> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> <dependencies> <dependency> Modified: branches/sandbox/rf4_build/framework/trunk/impl/pom.xml =================================================================== --- branches/sandbox/rf4_build/runtime/trunk/impl/pom.xml 2009-06-04 12:48:56 UTC (rev 14477) +++ branches/sandbox/rf4_build/framework/trunk/impl/pom.xml 2009-06-04 16:49:06 UTC (rev 14505) @@ -5,15 +5,14 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <groupId>org.richfaces.runtime</groupId> - <artifactId>version-matrix</artifactId> + <groupId>org.richfaces</groupId> + <artifactId>framework</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.runtime</groupId> - <artifactId>impl</artifactId> - <packaging>jar</packaging> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> <dependencies> <dependency> @@ -22,7 +21,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>api</artifactId> + <artifactId>richfaces-api</artifactId> <version>${project.version}</version> </dependency> </dependencies> Modified: branches/sandbox/rf4_build/framework/trunk/pom.xml =================================================================== --- branches/sandbox/rf4_build/runtime/trunk/pom.xml 2009-06-04 12:48:56 UTC (rev 14477) +++ branches/sandbox/rf4_build/framework/trunk/pom.xml 2009-06-04 16:49:06 UTC (rev 14505) @@ -4,28 +4,21 @@ 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>framework-version-matrix</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> - <artifactId>runtime</artifactId> - <version>4.0.0-SNAPSHOT</version> + <artifactId>framework</artifactId> <packaging>pom</packaging> <modules> - <module>version-matrix</module> <module>api</module> - <module>test</module> + <module>test-base</module> <module>impl</module> </modules> - <build> - <plugins> - <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 Copied: branches/sandbox/rf4_build/framework/trunk/test-base (from rev 14477, branches/sandbox/rf4_build/runtime/trunk/test) Modified: branches/sandbox/rf4_build/framework/trunk/test-base/pom.xml =================================================================== --- branches/sandbox/rf4_build/runtime/trunk/test/pom.xml 2009-06-04 12:48:56 UTC (rev 14477) +++ branches/sandbox/rf4_build/framework/trunk/test-base/pom.xml 2009-06-04 16:49:06 UTC (rev 14505) @@ -5,14 +5,14 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <groupId>org.richfaces.runtime</groupId> - <artifactId>version-matrix</artifactId> + <groupId>org.richfaces</groupId> + <artifactId>framework</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.runtime</groupId> - <artifactId>test</artifactId> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-test-base</artifactId> <packaging>jar</packaging> <dependencies> Copied: branches/sandbox/rf4_build/version-matrix/trunk/framework/pom.xml (from rev 14477, branches/sandbox/rf4_build/runtime/trunk/version-matrix/pom.xml) =================================================================== --- branches/sandbox/rf4_build/version-matrix/trunk/framework/pom.xml (rev 0) +++ branches/sandbox/rf4_build/version-matrix/trunk/framework/pom.xml 2009-06-04 16:49:06 UTC (rev 14505) @@ -0,0 +1,75 @@ +<?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>framework-version-matrix</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent --> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <!-- TODO: should artifactId start with 'richfaces'? --> + <artifactId>framework-version-matrix</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <properties> + <jsf.version>2.0.0-PR2_3</jsf.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> + </repositories> + + <dependencyManagement> + <dependencies> + <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> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <!-- all projects will consume JUnit --> + <dependency> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </dependency> + </dependencies> + + <build> + <plugins> + <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