4:06 p.m.
Author: jbalunas(a)redhat.com
Date: 2010-08-12 17:05:59 -0400 (Thu, 12 Aug 2010)
New Revision: 18602
Modified:
branches/RF-9040_build_updated_m2/archetypes/pom.xml
branches/RF-9040_build_updated_m2/dist/pom.xml
branches/RF-9040_build_updated_m2/examples/core-demo/pom.xml
branches/RF-9040_build_updated_m2/examples/iteration-demo/pom.xml
branches/RF-9040_build_updated_m2/examples/misc-demo/pom.xml
branches/RF-9040_build_updated_m2/examples/output-demo/pom.xml
branches/RF-9040_build_updated_m2/examples/pom.xml
branches/RF-9040_build_updated_m2/examples/repeater-demo/pom.xml
branches/RF-9040_build_updated_m2/examples/richfaces-showcase/pom.xml
Log:
RF-9040 examples, archetypes, & dist updated with refactor
Modified: branches/RF-9040_build_updated_m2/archetypes/pom.xml
===================================================================
--- branches/RF-9040_build_updated_m2/archetypes/pom.xml 2010-08-12 20:16:31 UTC (rev
18601)
+++ branches/RF-9040_build_updated_m2/archetypes/pom.xml 2010-08-12 21:05:59 UTC (rev
18602)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>9</version>
</parent>
<groupId>org.richfaces.archetypes</groupId>
@@ -43,6 +43,7 @@
</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>
Modified: branches/RF-9040_build_updated_m2/dist/pom.xml
===================================================================
--- branches/RF-9040_build_updated_m2/dist/pom.xml 2010-08-12 20:16:31 UTC (rev 18601)
+++ branches/RF-9040_build_updated_m2/dist/pom.xml 2010-08-12 21:05:59 UTC (rev 18602)
@@ -23,8 +23,8 @@
<parent>
<groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>9</version>
+ <artifactId>richfaces-bom</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces</groupId>
@@ -34,54 +34,43 @@
<name>Richfaces Distribution Assembler</name>
<properties>
-
<org.richfaces.commons.version>4.0.0-SNAPSHOT</org.richfaces.commons.version>
-
<org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version>
- <org.richfaces.ui.version>4.0.0-SNAPSHOT</org.richfaces.ui.version>
-
<org.richfaces.examples.core-demo.version>4.0.0-SNAPSHOT</org.richfaces.examples.core-demo.version>
-
<org.richfaces.examples.richfaces-showcase.version>4.0.0-SNAPSHOT</org.richfaces.examples.richfaces-showcase.version>
-
<org.richfaces.archetypes.richfaces-archetype-simpleapp.version>4.0.0-SNAPSHOT</org.richfaces.archetypes.richfaces-archetype-simpleapp.version>
</properties>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-components-api</artifactId>
- <version>${org.richfaces.ui.version}</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-components-ui</artifactId>
- <version>${org.richfaces.ui.version}</version>
</dependency>
<dependency>
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-api</artifactId>
- <version>${org.richfaces.core.version}</version>
</dependency>
<dependency>
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-impl</artifactId>
- <version>${org.richfaces.core.version}</version>
</dependency>
<dependency>
<groupId>org.richfaces.commons</groupId>
<artifactId>richfaces-commons-api</artifactId>
- <version>${org.richfaces.commons.version}</version>
</dependency>
<!-- Examples -->
<dependency>
<groupId>org.richfaces.examples</groupId>
<artifactId>core-demo</artifactId>
- <version>${org.richfaces.examples.core-demo.version}</version>
+ <version>${project.version}</version>
<type>war</type>
<classifier>tomcat6</classifier>
</dependency>
<dependency>
<groupId>org.richfaces.examples</groupId>
<artifactId>richfaces-showcase</artifactId>
-
<version>${org.richfaces.examples.richfaces-showcase.version}</version>
+ <version>${project.version}</version>
<type>war</type>
<classifier>tomcat6</classifier>
</dependency>
@@ -90,7 +79,7 @@
<dependency>
<groupId>org.richfaces.archetypes</groupId>
<artifactId>richfaces-archetype-simpleapp</artifactId>
-
<version>${org.richfaces.archetypes.richfaces-archetype-simpleapp.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: branches/RF-9040_build_updated_m2/examples/core-demo/pom.xml
===================================================================
--- branches/RF-9040_build_updated_m2/examples/core-demo/pom.xml 2010-08-12 20:16:31 UTC
(rev 18601)
+++ branches/RF-9040_build_updated_m2/examples/core-demo/pom.xml 2010-08-12 21:05:59 UTC
(rev 18602)
@@ -1,30 +1,32 @@
<?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">
+ <!--
+ 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>9</version>
+ <version>10-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.examples</groupId>
@@ -38,23 +40,26 @@
<snapshotRepository>dav:https://repository.jboss.org/nexus/content/repo...
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
+
<jetty.port>8080</jetty.port>
<richfaces.checkstyle.version>1</richfaces.checkstyle.version>
- <org.richfaces.ui.version>4.0.0-SNAPSHOT</org.richfaces.ui.version>
+
<org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-parent</artifactId>
- <version>${org.richfaces.ui.version}</version>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-bom</artifactId>
+ <version>${org.richfaces.bom.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
- <!-- simple logger binding: only messages of level INFO and higher are
printed-->
+ <!--
+ simple logger binding: only messages of level INFO and
+ higher are printed
+ -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
@@ -71,13 +76,14 @@
</dependencyManagement>
<dependencies>
+ <!-- JSF impl should be switchable in example specific parent -->
<dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
</dependency>
<dependency>
- <groupId>${jsf2.impl.groupid}</groupId>
- <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -150,7 +156,9 @@
<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>
@@ -212,8 +220,12 @@
</goals>
<phase>package</phase>
<configuration>
- <!-- TODO - basedir might have a problem with
release realitive
- path might be better to use
${project.build.directory} -->
+ <!--
+ TODO - basedir might have a
+ problem with release realitive
+ path might be better to use
+ ${project.build.directory}
+ -->
<classesDirectory>${basedir}/target/sources/sources</classesDirectory>
<classifier>sources</classifier>
</configuration>
@@ -239,14 +251,15 @@
</build>
<dependencies>
+ <!-- TODO these should be switchable in example specific parent
-->
<dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${jsf2.impl.groupid}</groupId>
- <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -270,7 +283,7 @@
</snapshots>
</repository>
</repositories>
-
+
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/exam...
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun...
Modified: branches/RF-9040_build_updated_m2/examples/iteration-demo/pom.xml
===================================================================
--- branches/RF-9040_build_updated_m2/examples/iteration-demo/pom.xml 2010-08-12 20:16:31
UTC (rev 18601)
+++ branches/RF-9040_build_updated_m2/examples/iteration-demo/pom.xml 2010-08-12 21:05:59
UTC (rev 18602)
@@ -1,32 +1,33 @@
<?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.
--->
+ <!--
+ 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">
+ 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>9</version>
+ <version>10-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.examples</groupId>
@@ -35,7 +36,7 @@
<version>4.0.0-SNAPSHOT</version>
<name>RichFaces Examples: Iteration</name>
- <properties>
+ <properties>
<snapshotRepository>dav:https://repository.jboss.org/nexus/content/repo...
<jetty.port>8080</jetty.port>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -46,14 +47,17 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-parent</artifactId>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
- <!-- simple logger binding: only messages of level INFO and higher are
printed-->
+ <!--
+ simple logger binding: only messages of level INFO and
+ higher are printed
+ -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
@@ -86,8 +90,8 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
-
+
<!-- API implementation for runtime -->
<dependency>
<groupId>org.richfaces.core</groupId>
@@ -103,12 +107,12 @@
</dependency>
<!-- JSF -->
<dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
</dependency>
<dependency>
- <groupId>${jsf2.impl.groupid}</groupId>
- <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -173,14 +177,16 @@
<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>
</connectors>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
<profiles>
@@ -188,13 +194,13 @@
<id>jee6</id>
<dependencies>
<dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${jsf2.impl.groupid}</groupId>
- <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/RF-9040_build_updated_m2/examples/misc-demo/pom.xml
===================================================================
--- branches/RF-9040_build_updated_m2/examples/misc-demo/pom.xml 2010-08-12 20:16:31 UTC
(rev 18601)
+++ branches/RF-9040_build_updated_m2/examples/misc-demo/pom.xml 2010-08-12 21:05:59 UTC
(rev 18602)
@@ -1,32 +1,33 @@
<?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.
--->
+ <!--
+ 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">
+ 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>9</version>
+ <version>10-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.examples</groupId>
@@ -46,14 +47,17 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-parent</artifactId>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
- <!-- simple logger binding: only messages of level INFO and higher are
printed-->
+ <!--
+ simple logger binding: only messages of level INFO and
+ higher are printed
+ -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
@@ -74,10 +78,10 @@
<groupId>org.richfaces.ui.misc</groupId>
<artifactId>richfaces-ui-misc-ui</artifactId>
</dependency>
- <!-- todo remove this dependency -->
+ <!-- todo remove this dependency -->
<dependency>
- <groupId>org.richfaces.ui.core</groupId>
- <artifactId>richfaces-ui-core-ui</artifactId>
+ <groupId>org.richfaces.ui.core</groupId>
+ <artifactId>richfaces-ui-core-ui</artifactId>
</dependency>
<dependency>
<groupId>org.richfaces.core</groupId>
@@ -85,12 +89,12 @@
</dependency>
<dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
</dependency>
<dependency>
- <groupId>${jsf2.impl.groupid}</groupId>
- <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -132,13 +136,13 @@
<id>jee6</id>
<dependencies>
<dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${jsf2.impl.groupid}</groupId>
- <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -184,7 +188,9 @@
<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: branches/RF-9040_build_updated_m2/examples/output-demo/pom.xml
===================================================================
--- branches/RF-9040_build_updated_m2/examples/output-demo/pom.xml 2010-08-12 20:16:31 UTC
(rev 18601)
+++ branches/RF-9040_build_updated_m2/examples/output-demo/pom.xml 2010-08-12 21:05:59 UTC
(rev 18602)
@@ -1,11 +1,12 @@
<?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">
+ 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>9</version>
+ <version>10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,7 +34,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <org.richfaces.ui.version>4.0.0-SNAPSHOT</org.richfaces.ui.version>
</properties>
<build>
@@ -78,13 +78,13 @@
<dependencies>
<dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${jsf2.impl.groupid}</groupId>
- <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -133,9 +133,9 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-parent</artifactId>
- <version>${version}</version>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-bom</artifactId>
+ <version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -153,12 +153,12 @@
</dependency>
<dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
</dependency>
<dependency>
- <groupId>${jsf2.impl.groupid}</groupId>
- <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -194,7 +194,10 @@
<artifactId>ehcache</artifactId>
</dependency>
- <!-- simple logger binding: only messages of level INFO and higher are
printed-->
+ <!--
+ simple logger binding: only messages of level INFO and
+ higher are printed
+ -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Modified: branches/RF-9040_build_updated_m2/examples/pom.xml
===================================================================
--- branches/RF-9040_build_updated_m2/examples/pom.xml 2010-08-12 20:16:31 UTC (rev
18601)
+++ branches/RF-9040_build_updated_m2/examples/pom.xml 2010-08-12 21:05:59 UTC (rev
18602)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>7</version>
+ <version>10-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.examples</groupId>
Modified: branches/RF-9040_build_updated_m2/examples/repeater-demo/pom.xml
===================================================================
--- branches/RF-9040_build_updated_m2/examples/repeater-demo/pom.xml 2010-08-12 20:16:31
UTC (rev 18601)
+++ branches/RF-9040_build_updated_m2/examples/repeater-demo/pom.xml 2010-08-12 21:05:59
UTC (rev 18602)
@@ -1,33 +1,34 @@
<?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.
--->
+ <!--
+ 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">
+ 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>9</version>
+ <version>10-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.examples</groupId>
@@ -54,7 +55,10 @@
<type>pom</type>
</dependency>
- <!-- simple logger binding: only messages of level INFO and higher are
printed-->
+ <!--
+ simple logger binding: only messages of level INFO and
+ higher are printed
+ -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
@@ -72,12 +76,12 @@
<dependencies>
<dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
</dependency>
<dependency>
- <groupId>${jsf2.impl.groupid}</groupId>
- <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -102,7 +106,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<profiles>
@@ -110,13 +114,13 @@
<id>jee6</id>
<dependencies>
<dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${jsf2.impl.groupid}</groupId>
- <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -162,7 +166,9 @@
<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>
@@ -181,5 +187,5 @@
<enabled>true</enabled>
</snapshots>
</repository>
- </repositories>
+ </repositories>
</project>
Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/pom.xml
===================================================================
--- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/pom.xml 2010-08-12
20:16:31 UTC (rev 18601)
+++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/pom.xml 2010-08-12
21:05:59 UTC (rev 18602)
@@ -1,13 +1,15 @@
<?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>
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>9</version>
+ <version>10-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.examples</groupId>
@@ -21,18 +23,18 @@
<snapshotRepository>dav:https://repository.jboss.org/nexus/content/repo...
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
+
<jetty.port>8080</jetty.port>
<richfaces.checkstyle.version>1</richfaces.checkstyle.version>
- <org.richfaces.ui.version>4.0.0-SNAPSHOT</org.richfaces.ui.version>
+
<org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-parent</artifactId>
- <version>${org.richfaces.ui.version}</version>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-bom</artifactId>
+ <version>${org.richfaces.bom.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -49,12 +51,12 @@
<artifactId>richfaces-components-ui</artifactId>
</dependency>
<dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
</dependency>
<dependency>
- <groupId>${jsf2.impl.groupid}</groupId>
- <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -81,7 +83,10 @@
<artifactId>ehcache</artifactId>
</dependency>
- <!-- simple logger binding: only messages of level INFO and higher are
printed-->
+ <!--
+ simple logger binding: only messages of level INFO and
+ higher are printed
+ -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -129,7 +134,9 @@
<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>
@@ -228,13 +235,13 @@
<dependencies>
<dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${jsf2.impl.groupid}</groupId>
- <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -243,11 +250,11 @@
<version>1.1</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</profile>
</profiles>
@@ -263,7 +270,7 @@
</snapshots>
</repository>
</repositories>
-
+
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/exam...
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun...