Author: Alex.Kolonitsky Date: 2010-05-12 10:11:04 -0400 (Wed, 12 May 2010) New Revision: 17003 Added: root/ui/core/trunk/parent/pom.xml Modified: root/build/parent/trunk/pom.xml root/examples/core-demo/trunk/pom.xml root/examples/pom.xml root/examples/repeater-demo/trunk/pom.xml root/examples/richfaces-demo/trunk/pom.xml root/ui/core/trunk/api/pom.xml root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractQueue.java root/ui/core/trunk/bom/pom.xml root/ui/core/trunk/pom.xml Log: update /ui/* bom/pom parente and examples Modified: root/build/parent/trunk/pom.xml =================================================================== --- root/build/parent/trunk/pom.xml 2010-05-12 10:04:53 UTC (rev 17002) +++ root/build/parent/trunk/pom.xml 2010-05-12 14:11:04 UTC (rev 17003) @@ -58,8 +58,10 @@ </issueManagement> <properties> + <richfaces.version>4.0.0-SNAPSHOT</richfaces.version> + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <richfaces.version>4.0.0-SNAPSHOT</richfaces.version> </properties> <!-- Repository management, including extra repositories if needed --> Modified: root/examples/core-demo/trunk/pom.xml =================================================================== --- root/examples/core-demo/trunk/pom.xml 2010-05-12 10:04:53 UTC (rev 17002) +++ root/examples/core-demo/trunk/pom.xml 2010-05-12 14:11:04 UTC (rev 17003) @@ -1,83 +1,65 @@ <?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.examples</groupId> - <artifactId>root</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> + <modelVersion>4.0.0</modelVersion> - <properties> - <example.componentName>core</example.componentName> - </properties> - - <repositories> - <repository> - <id>jboss-public-repository-group</id> - <name>Jboss Repository for Maven</name> - <url>https://repository.jboss.org/nexus/content/groups/public</url> - </repository> - <repository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>maven-repository2.dev.java.net</id> - <name>Java.net Repository for Maven 2</name> - <url>http://download.java.net/maven/2</url> - </repository> - </repositories> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.examples.components</groupId> - <artifactId>${example.componentName}-demo</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>war</packaging> - <name>RichFaces core demo</name> - - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>${example.componentName}</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>3.1.0.GA</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.8</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.8</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <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> - </plugins> - </build> + <parent> + <groupId>org.richfaces.examples</groupId> + <artifactId>examples-root</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <groupId>org.richfaces.examples</groupId> + <artifactId>${example.componentName}-demo</artifactId> + <packaging>war</packaging> + <name>RichFaces Examples: Core</name> + + <properties> + <example.componentName>core</example.componentName> + </properties> + + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>${example.componentName}</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.1.0.GA</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.8</version> + <scope>provided</scope> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: root/examples/pom.xml =================================================================== --- root/examples/pom.xml 2010-05-12 10:04:53 UTC (rev 17002) +++ root/examples/pom.xml 2010-05-12 14:11:04 UTC (rev 17003) @@ -1,163 +1,177 @@ <?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 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1-SNAPSHOT</version> + </parent> + <groupId>org.richfaces.examples</groupId> - <artifactId>root</artifactId> + <artifactId>examples-aggregator</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>richfaces examples all module aggregator</name> + <name>RichFaces Examples: Aggregator</name> - <modules> - <module>core-demo/trunk</module> - <module>repeater-demo/trunk</module> + <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/repo... + <properties> + <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repo... <jetty.port>8080</jetty.port> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - </properties> - - <distributionManagement> - <downloadUrl> - http://labs.jboss.com/portal/jbossrichfaces/downloads - </downloadUrl> - <repository> - <id>jboss-releases-repository</id> - <uniqueVersion>false</uniqueVersion> - <url>${releaseRepository}</url> - </repository> - <snapshotRepository> - <id>jboss-snapshots-repository</id> - <uniqueVersion>true</uniqueVersion> - <url>${snapshotRepository}</url> - </snapshotRepository> - <!--site> - <url>file:target/site2</url> - </site--> - </distributionManagement> - <dependencies> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - - <!-- simple logger binding: only messages of level INFO and higher are printed--> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version >1.5.8</version> - </dependency> - - <!-- TODO: uncomment when assembly will be ready --> - <!--dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <version>${ui.version}</version> - </dependency--> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.0.3-SNAPSHOT</version> - <!--scope>provided</scope--> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>2.0.3-SNAPSHOT</version> - <!--scope>provided</scope--> - </dependency> - <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>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.2</version> - </dependency> - </dependencies> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties> - <profiles> - <profile> + <distributionManagement> + <downloadUrl> + http://labs.jboss.com/portal/jbossrichfaces/downloads + </downloadUrl> + <repository> + <id>jboss-releases-repository</id> + <uniqueVersion>false</uniqueVersion> + <url>${releaseRepository}</url> + </repository> + <snapshotRepository> + <id>jboss-snapshots-repository</id> + <uniqueVersion>true</uniqueVersion> + <url>${snapshotRepository}</url> + </snapshotRepository> + <!--site> + <url>file:target/site2</url> + </site--> + </distributionManagement> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core-bom</artifactId> + <version>4.0.0-SNAPSHOT</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <!-- simple logger binding: only messages of level INFO and higher are printed--> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.8</version> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + </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.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> + </dependencies> + + <profiles> + <profile> <id>jee5</id> - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.0.3-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>2.0.3-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> + <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>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </dependencies> </profile> </profiles> - <build> - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.18</version> - <configuration> - <scanIntervalSeconds>10</scanIntervalSeconds> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>${jetty.port}</port> - <maxIdleTime>60000</maxIdleTime> - </connector> - </connectors> - </configuration> - </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> - + <build> + <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.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.18</version> + <configuration> + <scanIntervalSeconds>10</scanIntervalSeconds> + <connectors> + <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <port>${jetty.port}</port> + <maxIdleTime>60000</maxIdleTime> + </connector> + </connectors> + </configuration> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>2.3</version> @@ -196,10 +210,21 @@ <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> + + <repositories> + <repository> + <id>maven-repository2.dev.java.net</id> + <name>Java.net Repository for Maven 2</name> + <url>http://download.java.net/maven/2</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> </project> \ No newline at end of file Modified: root/examples/repeater-demo/trunk/pom.xml =================================================================== --- root/examples/repeater-demo/trunk/pom.xml 2010-05-12 10:04:53 UTC (rev 17002) +++ root/examples/repeater-demo/trunk/pom.xml 2010-05-12 14:11:04 UTC (rev 17003) @@ -1,43 +1,46 @@ -<?xml version="1.0"?><project> - <parent> - <artifactId>examples</artifactId> - <groupId>org.richfaces</groupId> - <version>4.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.examples</groupId> - <artifactId>repeater</artifactId> - <packaging>war</packaging> - <name>repeater Maven Webapp</name> - <version>4.0.0-SNAPSHOT</version> - <build> - <finalName>repeater</finalName> - <plugins> - <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> - <version>3.8.1</version> - <scope>test</scope> - </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> - </dependencies> +<?xml version="1.0"?> +<!-- + 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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <artifactId>examples</artifactId> + <groupId>org.richfaces</groupId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <groupId>org.richfaces.examples</groupId> + <artifactId>repeater</artifactId> + <packaging>war</packaging> + <name>Richfaces Examples: Repeater</name> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: root/examples/richfaces-demo/trunk/pom.xml =================================================================== --- root/examples/richfaces-demo/trunk/pom.xml 2010-05-12 10:04:53 UTC (rev 17002) +++ root/examples/richfaces-demo/trunk/pom.xml 2010-05-12 14:11:04 UTC (rev 17003) @@ -1,107 +1,92 @@ <?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 + 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>examples</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> + <modelVersion>4.0.0</modelVersion> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.examples</groupId> - <artifactId>richfaces-demo</artifactId> - <packaging>war</packaging> - <name>richfaces demo application </name> + <parent> + <groupId>org.richfaces.examples</groupId> + <artifactId>examples-root</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> - <repositories> - <repository> - <id>jboss-public-repository-group</id> - <name>Jboss Repository for Maven</name> - <url>https://repository.jboss.org/nexus/content/groups/public</url> - </repository> - <repository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>maven-repository2.dev.java.net</id> - <name>Java.net Repository for Maven 2</name> - <url>http://download.java.net/maven/2</url> - </repository> - </repositories> - - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>3.1.0.GA</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.8</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.8</version> - <scope>provided</scope> - </dependency> - </dependencies> + <groupId>org.richfaces.examples</groupId> + <artifactId>richfaces-demo</artifactId> + <packaging>war</packaging> + <name>Richfaces Examples: Richfaces Demo Application</name> - <build> - <finalName>richfaces-demo</finalName> - </build> - - <profiles> - <profile> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <finalName>richfaces-demo</finalName> + </build> + + <profiles> + <profile> <id>release</id> <build> - <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> - </executions> - <configuration> - <classifier>tomcat6</classifier> - </configuration> - </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> + </executions> + <configuration> + <classifier>tomcat6</classifier> + </configuration> + </plugin> + </plugins> </build> </profile> - <profile> + <profile> <id>jee5</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee5</webappDirectory> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee5 + </webappDirectory> + </configuration> + </plugin> + </plugins> + </build> </profile> </profiles> </project> Modified: root/ui/core/trunk/api/pom.xml =================================================================== --- root/ui/core/trunk/api/pom.xml 2010-05-12 10:04:53 UTC (rev 17002) +++ root/ui/core/trunk/api/pom.xml 2010-05-12 14:11:04 UTC (rev 17003) @@ -1,161 +1,113 @@ +<!-- + 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"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <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.ui</groupId> - <artifactId>core</artifactId> - <name>richfaces ui components: core</name> - <version>4.0.0-SNAPSHOT</version> - <packaging>jar</packaging> + <parent> + <groupId>org.richfaces.ui</groupId> + <artifactId>core-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <uri>http://richfaces.org/a4j</uri> - <shortName>a4j</shortName> - <displayName>Core ajax components tags</displayName> - </taglib> - </library> - </configuration> - <executions> - <execution> - <id>cdk-generate-sources</id> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</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>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <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>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>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - </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> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <configuration> - <aggregate>true</aggregate> - </configuration> - <executions> - <execution> - <id>generate-source</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.ui</groupId> + <artifactId>core-api</artifactId> + <name>Richfaces UI Components: Core API</name> + <packaging>jar</packaging> + <dependencies> + <!-- runtime --> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + </dependency> + <dependency> + <!-- todo remove this dependency or move to test scope --> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + </dependency> + + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <scope>provided</scope> + </dependency> + + <!-- JSF with dependencies --> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-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.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <scope>provided</scope> + </dependency> + + <!-- tests --> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <!-- todo api? --> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-test-stage</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </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> + </dependencies> </project> \ No newline at end of file Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractQueue.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractQueue.java 2010-05-12 10:04:53 UTC (rev 17002) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractQueue.java 2010-05-12 14:11:04 UTC (rev 17003) @@ -23,6 +23,7 @@ import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.Attribute; +import org.richfaces.cdk.annotations.Tag; import javax.faces.component.UIComponentBase; Modified: root/ui/core/trunk/bom/pom.xml =================================================================== --- root/ui/core/trunk/bom/pom.xml 2010-05-12 10:04:53 UTC (rev 17002) +++ root/ui/core/trunk/bom/pom.xml 2010-05-12 14:11:04 UTC (rev 17003) @@ -1,226 +1,60 @@ -<?xml version="1.0" encoding="utf-8"?> +<?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"> - <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> - <name>richfaces ui components version matrix</name> - <packaging>pom</packaging> + <modelVersion>4.0.0</modelVersion> - <distributionManagement> - <downloadUrl> - http://labs.jboss.com/portal/jbossrichfaces/downloads - </downloadUrl> - <repository> - <id>jboss-releases-repository</id> - <uniqueVersion>false</uniqueVersion> - <url>${releaseRepository}</url> - </repository> - <snapshotRepository> - <id>jboss-snapshots-repository</id> - <uniqueVersion>true</uniqueVersion> - <url>${snapshotRepository}</url> - </snapshotRepository> - <!--site> - <url>file:target/site2</url> - </site--> - </distributionManagement> - <repositories> - <repository> - <id>jboss-public-repository-group</id> - <url>https://repository.jboss.org/nexus/content/groups/public</url> - </repository> - </repositories> + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1-SNAPSHOT</version> + </parent> - <pluginRepositories> - <pluginRepository> - <id>jboss-public-repository-group</id> - <url>https://repository.jboss.org/nexus/content/groups/public</url> - </pluginRepository> - </pluginRepositories> + <groupId>org.richfaces.ui</groupId> + <artifactId>core-bom</artifactId> + <version>4.0.0-SNAPSHOT</version> + <name>Richfaces UI Components: Core BOM</name> + <packaging>pom</packaging> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-commons</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>4.0.0-SNAPSHOT</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> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</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> - - <!-- 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.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.2</version> - </dependency> - <!-- end --> - - <!-- Archetypes dependency --> - <!-- start --> - <dependency> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>2.0-alpha-4</version> - </dependency> - <!-- end --> + <properties> + <richfaces.core.api.version>4.0.0-SNAPSHOT</richfaces.core.api.version> + </properties> - <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> - </dependencyManagement> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-bom</artifactId> + <version>${richfaces.core.api.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>4.0.0-SNAPSHOT</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> - + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core-api</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> </project> Added: root/ui/core/trunk/parent/pom.xml =================================================================== --- root/ui/core/trunk/parent/pom.xml (rev 0) +++ root/ui/core/trunk/parent/pom.xml 2010-05-12 14:11:04 UTC (rev 17003) @@ -0,0 +1,155 @@ +<?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 + http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.richfaces.ui</groupId> + <artifactId>core-bom</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <groupId>org.richfaces.ui</groupId> + <artifactId>core-parent</artifactId> + <name>Richfaces UI Components: Core Parent</name> + <packaging>pom</packaging> + + <distributionManagement> + <downloadUrl> + http://labs.jboss.com/portal/jbossrichfaces/downloads + </downloadUrl> + <repository> + <id>jboss-releases-repository</id> + <uniqueVersion>false</uniqueVersion> + <url>${releaseRepository}</url> + </repository> + <snapshotRepository> + <id>jboss-snapshots-repository</id> + <uniqueVersion>true</uniqueVersion> + <url>${snapshotRepository}</url> + </snapshotRepository> + </distributionManagement> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>4.0.0-SNAPSHOT</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> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.0-beta-1</version> + <configuration> + <fail>false</fail> + </configuration> + </plugin> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <uri>http://richfaces.org/a4j</uri> + <shortName>a4j</shortName> + <displayName>Core ajax components tags</displayName> + </taglib> + </library> + </configuration> + <executions> + <execution> + <id>cdk-generate-sources</id> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + + <!-- Archetypes dependency --> + <dependency> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.0-alpha-4</version> + </dependency> + + <!-- tests --> + <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>org.jboss.test-jsf</groupId> + <artifactId>jsf-test-stage</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + </dependency> + </dependencies> + </dependencyManagement> + +</project> Modified: root/ui/core/trunk/pom.xml =================================================================== --- root/ui/core/trunk/pom.xml 2010-05-12 10:04:53 UTC (rev 17002) +++ root/ui/core/trunk/pom.xml 2010-05-12 14:11:04 UTC (rev 17003) @@ -1,48 +1,46 @@ <?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> - <groupId>org.richfaces.ui</groupId> - <artifactId>core-root</artifactId> - <name>richfaces ui components: core root</name> - <version>4.0.0-SNAPSHOT</version> - <packaging>pom</packaging> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>core-aggregator</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Richfaces UI Components: Core Aggregator</name> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - </properties> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + </plugin> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <executions> - <!--execution> - <phase>generate-sources</phase> - <goals> - <goal>compile-templates</goal> - </goals> - </execution--> - <!--execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution--> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.3</version> + <version>2.4</version> <dependencies> <dependency> @@ -85,9 +83,55 @@ </plugins> </reporting> - <modules> - <module>bom</module> - <module>api</module> - </modules> + <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> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <configuration> + <aggregate>true</aggregate> + </configuration> + <executions> + <execution> + <id>generate-source</id> + <phase>generate-sources</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <modules> + <module>bom</module> + <module>parent</module> + <module>api</module> + </modules> + </project> \ No newline at end of file