Author: jbalunas(a)redhat.com Date: 2010-05-11 20:58:15 -0400 (Tue, 11 May 2010) New Revision: 17000 Modified: root/core/trunk/api/pom.xml root/core/trunk/bom/pom.xml root/core/trunk/impl/pom.xml root/core/trunk/parent/pom.xml root/core/trunk/pom.xml Log: Coding in progress: initial core build updates based on new structure Modified: root/core/trunk/api/pom.xml =================================================================== --- root/core/trunk/api/pom.xml 2010-05-12 00:49:42 UTC (rev 16999) +++ root/core/trunk/api/pom.xml 2010-05-12 00:58:15 UTC (rev 17000) @@ -1,72 +1,89 @@ -<?xml version="1.0" encoding="UTF-8"?> + <!-- + JBoss, Home of Professional Open Source Copyright 2010, Red Hat, + Inc. and individual contributors by the @authors tag. See the + copyright.txt in the distribution for a full listing of + individual contributors. This is free software; you can + redistribute it and/or modify it under the terms of the GNU + Lesser General Public License as published by the Free Software + Foundation; either version 2.1 of the License, or (at your + option) any later version. This software is distributed in the + hope that it will be useful, but WITHOUT ANY WARRANTY; without + even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public License + for more details. You should have received a copy of the GNU + Lesser General Public License along with this software; if not, + write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: + http://www.fsf.org. + --> <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 + 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</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - <name>Java Server Faces AJAX framework API</name> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>richfaces-commons</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>release</id> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.2</version> - <configuration> - <javadocVersion>1.5</javadocVersion> - <aggregate>true</aggregate> - </configuration> - <executions> - <execution> - <id>generate-javadoc</id> - <phase>generate-sources</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + <name>RichFaces Core API</name> + + <description> + The RichFaces Core API. + </description> + + <dependencies> + <!-- Runtime dependencies --> + <dependency> + <groupId>org.richfaces.commons</groupId> + <artifactId>richfaces-commons-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + <!-- Provided dependencies --> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-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>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Test Dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: root/core/trunk/bom/pom.xml =================================================================== --- root/core/trunk/bom/pom.xml 2010-05-12 00:49:42 UTC (rev 16999) +++ root/core/trunk/bom/pom.xml 2010-05-12 00:58:15 UTC (rev 17000) @@ -0,0 +1,106 @@ + <!-- + JBoss, Home of Professional Open Source Copyright 2010, Red Hat, + Inc. and individual contributors by the @authors tag. See the + copyright.txt in the distribution for a full listing of + individual contributors. This is free software; you can + redistribute it and/or modify it under the terms of the GNU + Lesser General Public License as published by the Free Software + Foundation; either version 2.1 of the License, or (at your + option) any later version. This software is distributed in the + hope that it will be useful, but WITHOUT ANY WARRANTY; without + even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public License + for more details. You should have received a copy of the GNU + Lesser General Public License along with this software; if not, + write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: + http://www.fsf.org. + --> +<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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-bom</artifactId> + <packaging>pom</packaging> + <version>4.0.0-SNAPSHOT</version> + <name>RichFaces Core BOM</name> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1-SNAPSHOT</version> + </parent> + + <description> + The RichFaces Core "Bill of Materials". This defines core api/impl specific runtime dependency versions. + </description> + + <url>http://www.jboss.org/richfaces</url> + + <properties> + <richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version> + </properties> + + <!-- Runtime dependency management --> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-bom</artifactId> + <version>${richfaces.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.richfaces.commons</groupId> + <artifactId>richfaces-commons-bom</artifactId> + <version>${richfaces.commons.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- Required for EL-CSS func --> + <dependency> + <groupId>net.sourceforge.cssparser</groupId> + <artifactId>cssparser</artifactId> + <version>0.9.5</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> + </dependencies> + </dependencyManagement> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/core/... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> + +</project> Modified: root/core/trunk/impl/pom.xml =================================================================== --- root/core/trunk/impl/pom.xml 2010-05-12 00:49:42 UTC (rev 16999) +++ root/core/trunk/impl/pom.xml 2010-05-12 00:58:15 UTC (rev 17000) @@ -1,125 +1,245 @@ -<?xml version="1.0" encoding="UTF-8"?> + <!-- + JBoss, Home of Professional Open Source Copyright 2010, Red Hat, + Inc. and individual contributors by the @authors tag. See the + copyright.txt in the distribution for a full listing of + individual contributors. This is free software; you can + redistribute it and/or modify it under the terms of the GNU + Lesser General Public License as published by the Free Software + Foundation; either version 2.1 of the License, or (at your + option) any later version. This software is distributed in the + hope that it will be useful, but WITHOUT ANY WARRANTY; without + even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public License + for more details. You should have received a copy of the GNU + Lesser General Public License along with this software; if not, + write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: + http://www.fsf.org. + --> <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 + 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</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <name>JSF ajax framework implementation</name> + <parent> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>target/javascript</directory> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>javacc</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>javascript</id> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant antfile="${basedir}/generatescript.xml" inheritRefs="true"> - <target name="assembly" /> - <property name="target-dir" value="${project.build.directory}/javascript" /> - </ant> - </tasks> - <resourceRoot>${project.build.directory}/javascript</resourceRoot> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-javascript-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>compress</goal> - </goals> - <configuration> - <nosuffix>false</nosuffix> - <outputDirectory>${project.build.directory}/compressed/</outputDirectory> - <aggregations> - <aggregation> - <insertNewLine>true</insertNewLine> - <output>${project.build.outputDirectory}/org/ajax4jsf/framework.pack.js</output> - <includes> - <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/prototype-min.js</include> - <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/AJAX-min.js</include> - <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/scriptaculous/scriptaculous-min.js</include> - <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/jquery/jquery-min.js</include> - <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/jquery.utils-min.js</include> - <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/dnd-min.js</include> - <include>**/*-min.js</include> - </includes> - <excludes> - <exclude>**/*.pack.js</exclude> - <exclude>**/scriptaculous/*.js</exclude> - <exclude>**/extend-min.js</exclude> - <exclude>**/jquery.jcarousel-min.js</exclude> - <exclude>**/compressed.css</exclude> - </excludes> - </aggregation> - </aggregations> - <resources> - <resource> - <directory>target/javascript</directory> - </resource> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>jslint</id> - <phase>test</phase> - <goals> - <goal>jslint</goal> - </goals> - <configuration> - <includes> - <include>**/framework.pack.js</include> - </includes> - <resources> - <resource> - <directory>${project.build.outputDirectory}</directory> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + <name>RichFaces Core Implementation</name> + + <description> + The RichFaces Core Implementation. + </description> + + <dependencies> + <!-- Runtime Dependencies --> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.commons</groupId> + <artifactId>richfaces-commons-api</artifactId> + </dependency> + <dependency> + <groupId>net.sourceforge.cssparser</groupId> + <artifactId>cssparser</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + <!-- Provided Dependencies --> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-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>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Cache Impls --> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <optional>true</optional> + </dependency> + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + <optional>true</optional> + </dependency> + <dependency> + <groupId>opensymphony</groupId> + <artifactId>oscache</artifactId> + <optional>true</optional> + </dependency> + + <!-- Test Dependencies --> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymockclassextension</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <!-- TODO centalize if possible - need to research --> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>target/javascript</directory> + </resource> + </resources> + <plugins> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>javacc</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>javascript</id> + <phase>generate-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant antfile="${basedir}/generatescript.xml" + inheritRefs="true"> + <target name="assembly" /> + <property name="target-dir" + value="${project.build.directory}/javascript" /> + </ant> + </tasks> + <resourceRoot>${project.build.directory}/javascript</resourceRoot> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-javascript-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>compress</goal> + </goals> + <configuration> + <nosuffix>false</nosuffix> + <outputDirectory>${project.build.directory}/compressed/</outputDirectory> + <aggregations> + <aggregation> + <insertNewLine>true</insertNewLine> + <output>${project.build.outputDirectory}/org/ajax4jsf/framework.pack.js</output> + <includes> + <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/prototype-min.js</include> + <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/AJAX-min.js</include> + <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/scriptaculous/scriptaculous-min.js</include> + <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/jquery/jquery-min.js</include> + <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/jquery.utils-min.js</include> + <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/dnd-min.js</include> + <include>**/*-min.js</include> + </includes> + <excludes> + <exclude>**/*.pack.js</exclude> + <exclude>**/scriptaculous/*.js</exclude> + <exclude>**/extend-min.js</exclude> + <exclude>**/jquery.jcarousel-min.js</exclude> + <exclude>**/compressed.css</exclude> + </excludes> + </aggregation> + </aggregations> + <resources> + <resource> + <directory>target/javascript</directory> + </resource> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>jslint</id> + <phase>test</phase> + <goals> + <goal>jslint</goal> + </goals> + <configuration> + <includes> + <include>**/framework.pack.js</include> + </includes> + <resources> + <resource> + <directory>${project.build.outputDirectory}</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>gr.abiss.mvn.plugins</groupId> <artifactId>maven-jstools-plugin</artifactId> <version>0.7</version> @@ -129,81 +249,34 @@ <caseSensitive>true</caseSensitive> </configuration> </plugin> - </plugins> - </build> + </plugins> + </build> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>richfaces-api</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>opensymphony</groupId> - <artifactId>oscache</artifactId> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <optional>true</optional> - </dependency> - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>release</id> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.2</version> - <configuration> - <javadocVersion>1.5</javadocVersion> - <aggregate>true</aggregate> - </configuration> - <executions> - <execution> - <id>generate-javadoc</id> - <phase>generate-sources</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> + <profiles> + <profile> + <id>release</id> + <!-- TODO need to centralize - need to research first --> + <build> + <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.2</version> + <configuration> + <javadocVersion>1.5</javadocVersion> + <aggregate>true</aggregate> + </configuration> + <executions> + <execution> + <id>generate-javadoc</id> + <phase>generate-sources</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>gr.abiss.mvn.plugins</groupId> <artifactId>maven-jstools-plugin</artifactId> <version>0.7</version> @@ -222,8 +295,8 @@ </execution> </executions> </plugin> - </plugins> - </build> - </profile> - </profiles> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file Modified: root/core/trunk/parent/pom.xml =================================================================== --- root/core/trunk/parent/pom.xml 2010-05-12 00:49:42 UTC (rev 16999) +++ root/core/trunk/parent/pom.xml 2010-05-12 00:58:15 UTC (rev 17000) @@ -0,0 +1,81 @@ + <!-- + JBoss, Home of Professional Open Source Copyright 2010, Red Hat, + Inc. and individual contributors by the @authors tag. See the + copyright.txt in the distribution for a full listing of + individual contributors. This is free software; you can + redistribute it and/or modify it under the terms of the GNU + Lesser General Public License as published by the Free Software + Foundation; either version 2.1 of the License, or (at your + option) any later version. This software is distributed in the + hope that it will be useful, but WITHOUT ANY WARRANTY; without + even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public License + for more details. You should have received a copy of the GNU + Lesser General Public License along with this software; if not, + write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: + http://www.fsf.org. + --> +<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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-parent</artifactId> + <packaging>pom</packaging> + <version>4.0.0-SNAPSHOT</version> + <name>RichFaces Core Parent</name> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1-SNAPSHOT</version> + </parent> + + <description> + The Parent for all RichFaces core sub-projects. This specifies build and project meta-data. Runtime dependencies are imported via the bom. + </description> + + <properties> + <richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-bom</artifactId> + <version>${richfaces.core.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <!-- Test Dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.6</version> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <version>1.0.3</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> +</project> \ No newline at end of file Modified: root/core/trunk/pom.xml =================================================================== --- root/core/trunk/pom.xml 2010-05-12 00:49:42 UTC (rev 16999) +++ root/core/trunk/pom.xml 2010-05-12 00:58:15 UTC (rev 17000) @@ -1,109 +1,57 @@ -<?xml version="1.0" encoding="UTF-8"?> + <!-- + JBoss, Home of Professional Open Source Copyright 2010, Red Hat, + Inc. and individual contributors by the @authors tag. See the + copyright.txt in the distribution for a full listing of + individual contributors. This is free software; you can + redistribute it and/or modify it under the terms of the GNU + Lesser General Public License as published by the Free Software + Foundation; either version 2.1 of the License, or (at your + option) any later version. This software is distributed in the + hope that it will be useful, but WITHOUT ANY WARRANTY; without + even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public License + for more details. You should have received a copy of the GNU + Lesser General Public License along with this software; if not, + write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: + http://www.fsf.org. + --> <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 + 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> <parent> <groupId>org.richfaces</groupId> - <artifactId>framework-version-matrix</artifactId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>version-matrix/pom.xml</relativePath> + <artifactId>richfaces-parent</artifactId> + <version>1-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>framework</artifactId> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-aggregator</artifactId> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>JSF ajax framework</name> + <name>RichFaces Core Aggregator</name> + <description>The root aggregator for the richfaces core module. This manages intermodule relationships, and destribution assembly where needed.</description> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - </properties> - <modules> - <module>version-matrix</module> + <module>bom</module> + <module>parent</module> <module>api</module> <module>impl</module> </modules> <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-commons</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>${project.version}</version> - </dependency> - <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> - </dependencies> </dependencyManagement> <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> <reporting> + <!-- TODO need to centralize this - but need to research --> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -111,38 +59,53 @@ <version>2.3</version> <configuration> - <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation> - <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> + <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation> + <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> </configuration> </plugin> </plugins> </reporting> - + <profiles> + <!-- TODO need to move this - but need to research --> <profile> - <id>clover</id> + <id>checkstyle</id> + <!-- + It is a clever way to skip checkstyle for a sonar. If + you want skip checkstyle add "fast" parametr (means add + "-Dfast" in command line) + --> + <activation> + <property> + <name>!fast</name> + </property> + </activation> <build> <plugins> <plugin> - <groupId>com.atlassian.maven.plugins</groupId> - <artifactId>maven-clover2-plugin</artifactId> - <configuration> - <licenseLocation> - ${clover.license.path} - </licenseLocation> - <jdk>1.5</jdk> - <generatePdf>false</generatePdf> - <generateXml>true</generateXml> - <generateHtml>true</generateHtml> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.3</version> + + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>checkstyle</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <executions> <execution> - <id>instrument</id> - <phase>verify</phase> + <id>richfaces-checkstyle-report</id> + <configuration> + <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation> + <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> + </configuration> + + <phase>process-sources</phase> <goals> - <goal>instrument</goal> <goal>check</goal> - <goal>clover</goal> </goals> </execution> </executions> @@ -150,58 +113,7 @@ </plugins> </build> </profile> - <profile> - <id>hudson</id> - <properties> - <clover.license.path>/home/hudson/config_repository/resources/richfaces/richfaces-clover-license.txt - </clover.license.path> - </properties> - </profile> - <profile> - <id>checkstyle</id> - <!-- - It is a clever way to skip checkstyle for a sonar. - If you want skip checkstyle add "fast" parametr (means add "-Dfast" in command line) - --> - <activation> - <property> - <name>!fast</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.3</version> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>checkstyle</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <executions> - <execution> - <id>richfaces-checkstyle-report</id> - <configuration> - <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation> - <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> - </configuration> - - <phase>process-sources</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project>