Author: jbalunas(a)redhat.com Date: 2010-08-22 13:06:52 -0400 (Sun, 22 Aug 2010) New Revision: 18914 Modified: trunk/archetypes/pom.xml trunk/bom/pom.xml trunk/cdk/maven-resources-plugin/pom.xml trunk/cdk/parent/pom.xml trunk/cdk/pom.xml trunk/examples/core-demo/pom.xml trunk/examples/input-demo/pom.xml trunk/examples/iteration-demo/pom.xml trunk/examples/misc-demo/pom.xml trunk/examples/output-demo/pom.xml trunk/examples/parent/pom.xml trunk/examples/pom.xml trunk/examples/repeater-demo/pom.xml trunk/examples/richfaces-showcase/pom.xml trunk/parent/pom.xml trunk/pom.xml trunk/ui/core/api/pom.xml trunk/ui/core/ui/pom.xml trunk/ui/input/api/pom.xml trunk/ui/misc/pom.xml trunk/ui/misc/ui/pom.xml trunk/ui/output/api/pom.xml trunk/ui/parent/pom.xml trunk/ui/pom.xml Log: [maven-release-plugin] rollback the release of 4.0.0.20100822-M2 Modified: trunk/archetypes/pom.xml =================================================================== --- trunk/archetypes/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/archetypes/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -1,56 +1,58 @@ -<?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>10</version> - <relativePath>../build/parent/pom.xml</relativePath> - </parent> - - <groupId>org.richfaces.archetypes</groupId> - <artifactId>archetypes-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>RichFaces Archetypes: Aggregator</name> - - <modules> - <module>richfaces-archetype-simpleapp</module> - <module>richfaces-component</module> - <module>richfaces-component-short</module> - <module>richfaces-components-aggregator</module> - </modules> - - <properties> - <!-- TODO verify if these are needed here - I believe they are inherited from parent --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - </properties> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/arch... - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... - <url>http://fisheye.jboss.org/browse/richfaces/trunk/archetypes</url... - </scm> - -</project> +<?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>10</version> + <relativePath>../build/parent/pom.xml</relativePath> + </parent> + + <groupId>org.richfaces.archetypes</groupId> + <artifactId>archetypes-aggregator</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>RichFaces Archetypes: Aggregator</name> + + <modules> + <module>richfaces-archetype-simpleapp</module> + <module>richfaces-component</module> + <module>richfaces-component-short</module> + <module>richfaces-components-aggregator</module> + </modules> + + <properties> + <!-- TODO verify if these are needed here - I believe they are inherited from parent --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/arch... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... + <url>http://fisheye.jboss.org/browse/richfaces/trunk/archetypes</url... + </scm> + +</project> Modified: trunk/bom/pom.xml =================================================================== --- trunk/bom/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/bom/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -17,7 +17,8 @@ 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"> +<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</groupId> Modified: trunk/cdk/maven-resources-plugin/pom.xml =================================================================== --- trunk/cdk/maven-resources-plugin/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/cdk/maven-resources-plugin/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -1,4 +1,5 @@ -<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"> +<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> Modified: trunk/cdk/parent/pom.xml =================================================================== --- trunk/cdk/parent/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/cdk/parent/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -1,6 +1,7 @@ <?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"> +<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> Modified: trunk/cdk/pom.xml =================================================================== --- trunk/cdk/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/cdk/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -1,6 +1,7 @@ <?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"> +<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>richfaces-parent</artifactId> Modified: trunk/examples/core-demo/pom.xml =================================================================== --- trunk/examples/core-demo/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/examples/core-demo/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -17,7 +17,9 @@ 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"> +<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> Modified: trunk/examples/input-demo/pom.xml =================================================================== --- trunk/examples/input-demo/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/examples/input-demo/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -1,175 +1,176 @@ -<?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.examples</groupId> - <artifactId>richfaces-example-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <groupId>org.richfaces.examples</groupId> - <artifactId>input-demo</artifactId> - <version>4.0.0-SNAPSHOT</version> - <name>Richfaces Examples: Inputs</name> - <packaging>war</packaging> - - <build> - <finalName>${artifactId}-${project.version}</finalName> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <version>2.1-beta-1</version> - <configuration> - <webResources> - <resource> - <directory>${basedir}/src/main/java</directory> - <targetPath>/WEB-INF/src</targetPath> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>jee6</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <version>2.1-alpha-1</version> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <!-- JSF impl should be switchable in example specific parent --> - <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.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <executions> - <execution> - <id>jee6</id> - <phase>package</phase> - <goals> - <goal>war</goal> - </goals> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> - <classifier>jee6</classifier> - <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</packagingExcludes> - <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</warSourceExcludes> - </configuration> - </execution> - </executions> - <configuration> - <webResources> - <resource> - <directory>${basedir}/src/main/java</directory> - <targetPath>/WEB-INF/src</targetPath> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <dependencies> - <dependency> - <groupId>org.richfaces.ui.input</groupId> - <artifactId>richfaces-ui-input-ui</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.ui.core</groupId> - <artifactId>richfaces-ui-core-ui</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> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.8</version> - </dependency> - - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - </dependency> - - <!-- - simple logger binding: only messages of level INFO and - higher are printed - --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.8</version> - </dependency> - - <!-- Log4J dependency used in examples --> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - - <!-- Tests --> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.10</version> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency> - </dependencies> -</project> +<?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.examples</groupId> + <artifactId>richfaces-example-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.richfaces.examples</groupId> + <artifactId>input-demo</artifactId> + <version>4.0.0-SNAPSHOT</version> + <name>Richfaces Examples: Inputs</name> + <packaging>war</packaging> + + <build> + <finalName>${artifactId}-${project.version}</finalName> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-beta-1</version> + <configuration> + <webResources> + <resource> + <directory>${basedir}/src/main/java</directory> + <targetPath>/WEB-INF/src</targetPath> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>jee6</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-alpha-1</version> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <!-- JSF impl should be switchable in example specific parent --> + <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.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>jee6</id> + <phase>package</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> + <classifier>jee6</classifier> + <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</packagingExcludes> + <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</warSourceExcludes> + </configuration> + </execution> + </executions> + <configuration> + <webResources> + <resource> + <directory>${basedir}/src/main/java</directory> + <targetPath>/WEB-INF/src</targetPath> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <dependencies> + <dependency> + <groupId>org.richfaces.ui.input</groupId> + <artifactId>richfaces-ui-input-ui</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui.core</groupId> + <artifactId>richfaces-ui-core-ui</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> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.8</version> + </dependency> + + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + </dependency> + + <!-- + simple logger binding: only messages of level INFO and + higher are printed + --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + </dependency> + + <!-- Log4J dependency used in examples --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + + <!-- Tests --> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.10</version> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> + </dependencies> +</project> Modified: trunk/examples/iteration-demo/pom.xml =================================================================== --- trunk/examples/iteration-demo/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/examples/iteration-demo/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -17,7 +17,9 @@ 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"> +<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> Modified: trunk/examples/misc-demo/pom.xml =================================================================== --- trunk/examples/misc-demo/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/examples/misc-demo/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -17,7 +17,10 @@ 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"> +<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> Modified: trunk/examples/output-demo/pom.xml =================================================================== --- trunk/examples/output-demo/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/examples/output-demo/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -1,179 +1,181 @@ -<?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.examples</groupId> - <artifactId>richfaces-example-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <groupId>org.richfaces.examples</groupId> - <artifactId>output-demo</artifactId> - <version>4.0.0-SNAPSHOT</version> - <name>Richfaces Examples: Outputs</name> - <packaging>war</packaging> - - <properties> - </properties> - - <build> - <finalName>${artifactId}-${project.version}</finalName> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <version>2.1-beta-1</version> - <configuration> - <webResources> - <resource> - <directory>${basedir}/src/main/java</directory> - <targetPath>/WEB-INF/src</targetPath> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>jee6</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <version>2.1-alpha-1</version> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> - </configuration> - </plugin> - </plugins> - </build> - - <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> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <executions> - <execution> - <id>jee6</id> - <phase>package</phase> - <goals> - <goal>war</goal> - </goals> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> - <classifier>jee6</classifier> - <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</packagingExcludes> - <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</warSourceExcludes> - </configuration> - </execution> - </executions> - <configuration> - <webResources> - <resource> - <directory>${basedir}/src/main/java</directory> - <targetPath>/WEB-INF/src</targetPath> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <dependencies> - <dependency> - <groupId>org.richfaces.ui.output</groupId> - <artifactId>richfaces-ui-output-ui</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.ui.core</groupId> - <artifactId>richfaces-ui-core-ui</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> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.8</version> - </dependency> - - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - </dependency> - - <!-- - simple logger binding: only messages of level INFO and - higher are printed - --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.8</version> - </dependency> - - <!-- Log4J dependency used in examples --> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - - <!-- Tests --> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.10</version> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency> - </dependencies> -</project> +<?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.examples</groupId> + <artifactId>richfaces-example-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.richfaces.examples</groupId> + <artifactId>output-demo</artifactId> + <version>4.0.0-SNAPSHOT</version> + <name>Richfaces Examples: Outputs</name> + <packaging>war</packaging> + + <properties> + </properties> + + <build> + <finalName>${artifactId}-${project.version}</finalName> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-beta-1</version> + <configuration> + <webResources> + <resource> + <directory>${basedir}/src/main/java</directory> + <targetPath>/WEB-INF/src</targetPath> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>jee6</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-alpha-1</version> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> + </configuration> + </plugin> + </plugins> + </build> + + <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> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>jee6</id> + <phase>package</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> + <classifier>jee6</classifier> + <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</packagingExcludes> + <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</warSourceExcludes> + </configuration> + </execution> + </executions> + <configuration> + <webResources> + <resource> + <directory>${basedir}/src/main/java</directory> + <targetPath>/WEB-INF/src</targetPath> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <dependencies> + <dependency> + <groupId>org.richfaces.ui.output</groupId> + <artifactId>richfaces-ui-output-ui</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui.core</groupId> + <artifactId>richfaces-ui-core-ui</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> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.8</version> + </dependency> + + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + </dependency> + + <!-- + simple logger binding: only messages of level INFO and + higher are printed + --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + </dependency> + + <!-- Log4J dependency used in examples --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + + <!-- Tests --> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.10</version> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> + </dependencies> +</project> Modified: trunk/examples/parent/pom.xml =================================================================== --- trunk/examples/parent/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/examples/parent/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -1,228 +1,231 @@ -<?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>10</version> - <relativePath>../../build/parent/pom.xml</relativePath> - </parent> - - <groupId>org.richfaces.examples</groupId> - <artifactId>richfaces-example-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>RichFaces Examples Parent</name> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - - <jetty.port>8080</jetty.port> - <richfaces.checkstyle.version>2</richfaces.checkstyle.version> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - </dependencies> - </dependencyManagement> - - <!-- Build --> - <build> - <!-- - PluginManagement config for all examples - --> - <pluginManagement> - <plugins> - <!-- Build --> - <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-jar-plugin</artifactId> - <configuration> - <archive> - <index>true</index> - <manifest> - <addDefaultSpecificationEntries> - true - </addDefaultSpecificationEntries> - <addDefaultImplementationEntries> - true - </addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <mode>development</mode> - <Build-Number>${buildNumber} - </Build-Number> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.3</version> - <configuration> - <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml - </configLocation> - </configuration> - <executions> - <execution> - <id>richfaces-checkstyle-report</id> - <phase>process-sources</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-build-checkstyle</artifactId> - <version>${richfaces.checkstyle.version}</version> - </dependency> - </dependencies> - </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> - </plugins> - </pluginManagement> - </build> - <profiles> - <!-- - The following profiles determine the JSF api/impl - combinations that will be used in the project builds. - - -Djsf_profile=<profile-name> on the mvn command line - --> - <profile> - <id>jsf_ri</id> - <activation> - <property> - <name>!jsf_profile</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - </dependency> - </dependencies> - </profile> - <profile> - <id>myfaces</id> - <activation> - <property> - <name>jsf_profile</name> - <value>myfaces</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-impl</artifactId> - </dependency> - </dependencies> - </profile> - <profile> - <id>jsf_ri_2_1_snapshot</id> - <activation> - <property> - <name>jsf_profile</name> - <value>jsf_ri_2_1_snapshot</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>2.1.0-SNAPSHOT</version> - </dependency> - </dependencies> - </profile> - <profile> - <id>myfaces_snapshot</id> - <activation> - <property> - <name>jsf_profile</name> - <value>myfaces_snapshot</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - <version>2.0.2-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-impl</artifactId> - <version>2.0.2-SNAPSHOT</version> - </dependency> - </dependencies> - </profile> - </profiles> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/exam... - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... - <url>http://fisheye.jboss.org/browse/richfaces/trunk/examples/parent<... - </scm> +<?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>10</version> + <relativePath>../../build/parent/pom.xml</relativePath> + </parent> + + <groupId>org.richfaces.examples</groupId> + <artifactId>richfaces-example-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>RichFaces Examples Parent</name> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + + <jetty.port>8080</jetty.port> + <richfaces.checkstyle.version>2</richfaces.checkstyle.version> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-bom</artifactId> + <version>${project.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + + <!-- Build --> + <build> + <!-- + PluginManagement config for all examples + --> + <pluginManagement> + <plugins> + <!-- Build --> + <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-jar-plugin</artifactId> + <configuration> + <archive> + <index>true</index> + <manifest> + <addDefaultSpecificationEntries> + true + </addDefaultSpecificationEntries> + <addDefaultImplementationEntries> + true + </addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <mode>development</mode> + <Build-Number>${buildNumber} + </Build-Number> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.3</version> + <configuration> + <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml + </configLocation> + </configuration> + <executions> + <execution> + <id>richfaces-checkstyle-report</id> + <phase>process-sources</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-build-checkstyle</artifactId> + <version>${richfaces.checkstyle.version}</version> + </dependency> + </dependencies> + </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> + </plugins> + </pluginManagement> + </build> + <profiles> + <!-- + The following profiles determine the JSF api/impl + combinations that will be used in the project builds. + + -Djsf_profile=<profile-name> on the mvn command line + --> + <profile> + <id>jsf_ri</id> + <activation> + <property> + <name>!jsf_profile</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + </dependency> + </dependencies> + </profile> + <profile> + <id>myfaces</id> + <activation> + <property> + <name>jsf_profile</name> + <value>myfaces</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-impl</artifactId> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf_ri_2_1_snapshot</id> + <activation> + <property> + <name>jsf_profile</name> + <value>jsf_ri_2_1_snapshot</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.1.0-SNAPSHOT</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>myfaces_snapshot</id> + <activation> + <property> + <name>jsf_profile</name> + <value>myfaces_snapshot</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-api</artifactId> + <version>2.0.2-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-impl</artifactId> + <version>2.0.2-SNAPSHOT</version> + </dependency> + </dependencies> + </profile> + </profiles> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/exam... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... + <url>http://fisheye.jboss.org/browse/richfaces/trunk/examples/parent<... + </scm> </project> \ No newline at end of file Modified: trunk/examples/pom.xml =================================================================== --- trunk/examples/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/examples/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -1,59 +1,61 @@ -<?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> - - <!-- - This aggregator pom, is not released, and is only used to make - it easy to build all of the examples at once from trunk. - --> - - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>10</version> - <relativePath>../build/parent/pom.xml</relativePath> - </parent> - - <groupId>org.richfaces.examples</groupId> - <artifactId>examples-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>RichFaces Examples: Aggregator</name> - - <modules> - <module>parent</module> - <module>core-demo</module> - <module>misc-demo</module> - <module>output-demo</module> - <module>input-demo</module> - <module>repeater-demo</module> - <module>iteration-demo</module> - <module>richfaces-showcase</module> - <!--<module>dist</module>--> - </modules> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/exam... - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... - <url>http://fisheye.jboss.org/browse/richfaces/trunk/examples</url> - </scm> - -</project> +<?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> + + <!-- + This aggregator pom, is not released, and is only used to make + it easy to build all of the examples at once from trunk. + --> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>10</version> + <relativePath>../build/parent/pom.xml</relativePath> + </parent> + + <groupId>org.richfaces.examples</groupId> + <artifactId>examples-aggregator</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>RichFaces Examples: Aggregator</name> + + <modules> + <module>parent</module> + <module>core-demo</module> + <module>misc-demo</module> + <module>output-demo</module> + <module>input-demo</module> + <module>repeater-demo</module> + <module>iteration-demo</module> + <module>richfaces-showcase</module> + <!--<module>dist</module>--> + </modules> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/exam... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... + <url>http://fisheye.jboss.org/browse/richfaces/trunk/examples</url> + </scm> + +</project> Modified: trunk/examples/repeater-demo/pom.xml =================================================================== --- trunk/examples/repeater-demo/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/examples/repeater-demo/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -18,7 +18,10 @@ 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"> +<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> Modified: trunk/examples/richfaces-showcase/pom.xml =================================================================== --- trunk/examples/richfaces-showcase/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/examples/richfaces-showcase/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -1,6 +1,7 @@ <?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"> +<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> @@ -87,7 +88,8 @@ <configuration> <scanIntervalSeconds>10</scanIntervalSeconds> <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <connector + implementation="org.mortbay.jetty.nio.SelectChannelConnector"> <port>${jetty.port}</port> <maxIdleTime>60000</maxIdleTime> </connector> Modified: trunk/parent/pom.xml =================================================================== --- trunk/parent/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/parent/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -17,7 +17,8 @@ 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"> +<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</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -1,66 +1,68 @@ -<?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>richfaces-parent</artifactId> - <version>10</version> - <relativePath>build/parent/pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-root</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Richfaces Aggregator</name> - - <modules> - <module>bom</module> - <module>parent</module> - <module>core</module> - <module>cdk</module> - - <!-- richfaces ui --> - <module>ui</module> - - <!-- Remaining --> - <module>archetypes</module> - <module>examples</module> - <!--<module>docs</module>--> - </modules> - - <build> - <plugins> - <!-- To trigger the release --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>bootstrap</id> - <modules> - <module>build/parent</module> - <module>build/checkstyle</module> - <module>build/faces-shade-transformers</module> - </modules> - </profile> - <profile> - <id>release</id> - <modules> - <module>dist</module> - </modules> - </profile> - </profiles> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk</... - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... - <url>http://fisheye.jboss.org/browse/richfaces/trunk</url> - </scm> -</project> +<?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>richfaces-parent</artifactId> + <version>10</version> + <relativePath>build/parent/pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-root</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Richfaces Aggregator</name> + + <modules> + <module>bom</module> + <module>parent</module> + <module>core</module> + <module>cdk</module> + + <!-- richfaces ui --> + <module>ui</module> + + <!-- Remaining --> + <module>archetypes</module> + <module>examples</module> + <!--<module>docs</module>--> + </modules> + + <build> + <plugins> + <!-- To trigger the release --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>bootstrap</id> + <modules> + <module>build/parent</module> + <module>build/checkstyle</module> + <module>build/faces-shade-transformers</module> + </modules> + </profile> + <profile> + <id>release</id> + <modules> + <module>dist</module> + </modules> + </profile> + </profiles> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk</... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... + <url>http://fisheye.jboss.org/browse/richfaces/trunk</url> + </scm> +</project> Modified: trunk/ui/core/api/pom.xml =================================================================== --- trunk/ui/core/api/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/ui/core/api/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -15,7 +15,8 @@ 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"> +<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"> <parent> <groupId>org.richfaces.ui</groupId> Modified: trunk/ui/core/ui/pom.xml =================================================================== --- trunk/ui/core/ui/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/ui/core/ui/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -18,7 +18,9 @@ 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"> +<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" +> <parent> <groupId>org.richfaces.ui</groupId> Modified: trunk/ui/input/api/pom.xml =================================================================== --- trunk/ui/input/api/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/ui/input/api/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -19,7 +19,8 @@ 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"> +<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.ui</groupId> Modified: trunk/ui/misc/pom.xml =================================================================== --- trunk/ui/misc/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/ui/misc/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -18,7 +18,9 @@ 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"> +<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> Modified: trunk/ui/misc/ui/pom.xml =================================================================== --- trunk/ui/misc/ui/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/ui/misc/ui/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -17,7 +17,8 @@ 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"> +<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> Modified: trunk/ui/output/api/pom.xml =================================================================== --- trunk/ui/output/api/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/ui/output/api/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -19,7 +19,8 @@ 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"> +<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.ui</groupId> Modified: trunk/ui/parent/pom.xml =================================================================== --- trunk/ui/parent/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/ui/parent/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -18,7 +18,9 @@ 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"> +<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> Modified: trunk/ui/pom.xml =================================================================== --- trunk/ui/pom.xml 2010-08-22 16:22:09 UTC (rev 18913) +++ trunk/ui/pom.xml 2010-08-22 17:06:52 UTC (rev 18914) @@ -1,50 +1,53 @@ -<?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> - - <!-- This aggregator pom, is not released, and is only used to make it easy to build all of the - examples at once from trunk. --> - - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>10</version> -<relativePath>../build/parent/pom.xml</relativePath> - </parent> - - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>RichFaces UI: Aggregator</name> - - <modules> - <module>parent</module> - <module>common</module> - <module>core</module> - <module>iteration</module> - <module>misc</module> - <module>output</module> - <module>input</module> - <module>dist</module> - </modules> -</project> - +<?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> + + <!-- This aggregator pom, is not released, and is only used to make it easy to build all of the + examples at once from trunk. --> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>10</version> +<relativePath>../build/parent/pom.xml</relativePath> + </parent> + + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-aggregator</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>RichFaces UI: Aggregator</name> + + <modules> + <module>parent</module> + <module>common</module> + <module>core</module> + <module>iteration</module> + <module>misc</module> + <module>output</module> + <module>input</module> + <module>dist</module> + </modules> + +</project> +