[richfaces-svn-commits] JBoss Rich Faces SVN: r18854 - in trunk: archetypes and 35 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Fri Aug 20 12:18:08 EDT 2010
Author: jbalunas at redhat.com
Date: 2010-08-20 12:18:06 -0400 (Fri, 20 Aug 2010)
New Revision: 18854
Added:
trunk/examples/parent/
trunk/examples/parent/pom.xml
trunk/parent/
trunk/parent/pom.xml
Removed:
trunk/examples/parent/pom.xml
trunk/parent/pom.xml
Modified:
trunk/
trunk/archetypes/pom.xml
trunk/archetypes/richfaces-archetype-simpleapp/pom.xml
trunk/archetypes/richfaces-component-short/pom.xml
trunk/archetypes/richfaces-component/pom.xml
trunk/archetypes/richfaces-components-aggregator/pom.xml
trunk/bom/pom.xml
trunk/cdk/annotations/pom.xml
trunk/cdk/generator/pom.xml
trunk/cdk/parent/pom.xml
trunk/cdk/pom.xml
trunk/core/parent/pom.xml
trunk/core/pom.xml
trunk/dist/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/pom.xml
trunk/examples/repeater-demo/pom.xml
trunk/examples/richfaces-showcase/pom.xml
trunk/pom.xml
trunk/ui/common/pom.xml
trunk/ui/core/api/pom.xml
trunk/ui/core/pom.xml
trunk/ui/dist/pom.xml
trunk/ui/dist/richfaces-components-api/pom.xml
trunk/ui/dist/richfaces-components-ui/pom.xml
trunk/ui/input/pom.xml
trunk/ui/iteration/pom.xml
trunk/ui/misc/pom.xml
trunk/ui/misc/ui/pom.xml
trunk/ui/output/pom.xml
trunk/ui/parent/pom.xml
trunk/ui/pom.xml
Log:
Merged revisions 18785-18786,18788,18791-18792,18815,18822,18827,18829,18835,18847 via svnmerge from
https://svn.jboss.org/repos/richfaces/branches/RF-9112
.......
r18785 | jbalunas at redhat.com | 2010-08-18 17:03:08 -0400 (Wed, 18 Aug 2010) | 1 line
RF-9112 Initial impl of root parent
.......
r18786 | jbalunas at redhat.com | 2010-08-18 17:03:41 -0400 (Wed, 18 Aug 2010) | 1 line
RF-9112 initial install of root parent
.......
r18788 | alexsmirnov | 2010-08-18 18:19:12 -0400 (Wed, 18 Aug 2010) | 1 line
change externals to working branches
.......
r18791 | jbalunas at redhat.com | 2010-08-18 20:48:15 -0400 (Wed, 18 Aug 2010) | 1 line
RF-9112 Updated shade versions to snapshot until release
.......
r18792 | jbalunas at redhat.com | 2010-08-18 21:31:22 -0400 (Wed, 18 Aug 2010) | 1 line
RF-9112 updates to build so that bootstrap works. Note offline mode does not because richface-root aggregator must have access to richfaces-parent
.......
r18815 | jbalunas at redhat.com | 2010-08-19 10:14:47 -0400 (Thu, 19 Aug 2010) | 1 line
RF-9112 initial switch to root-parent usage
.......
r18822 | jbalunas at redhat.com | 2010-08-19 11:59:18 -0400 (Thu, 19 Aug 2010) | 1 line
RF-9112 update to root-parent pom
.......
r18827 | jbalunas at redhat.com | 2010-08-19 15:33:16 -0400 (Thu, 19 Aug 2010) | 1 line
RF-9069,RF-9112 Created parent for examples
.......
r18829 | jbalunas at redhat.com | 2010-08-19 16:14:14 -0400 (Thu, 19 Aug 2010) | 1 line
RF-9112 updates based on Nicks comments
.......
r18835 | alexsmirnov | 2010-08-19 20:30:13 -0400 (Thu, 19 Aug 2010) | 1 line
fix bootstrap build
.......
r18847 | jbalunas at redhat.com | 2010-08-20 10:03:56 -0400 (Fri, 20 Aug 2010) | 1 line
RF-9112 removed htmlunit override so that tests don't error
.......
Property changes on: trunk
___________________________________________________________________
Name: svn:externals
- ^/tags/richfaces-parent-9 build/parent
^/tags/richfaces-checkstyle-1 build/checkstyle
^/tags/faces-shade-transformers-2 build/faces-shade-transformers
+ build/parent https://svn.jboss.org/repos/richfaces/modules/build/parent/trunk/
build/checkstyle https://svn.jboss.org/repos/richfaces/modules/build/resources/trunk/checkstyle/
build/faces-shade-transformers https://svn.jboss.org/repos/richfaces/modules/build/resources/trunk/faces-shade-transformers/
Name: svnmerge-integrated
- /branches/RF-9112:1-18779 /branches/RF-9023:1-18690 /branches/RF-9040_build_updated_m2:1-18626
+ /branches/RF-9112:1-18852 /branches/RF-9023:1-18690 /branches/RF-9040_build_updated_m2:1-18626
Modified: trunk/archetypes/pom.xml
===================================================================
--- trunk/archetypes/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/archetypes/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -27,6 +27,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.archetypes</groupId>
Modified: trunk/archetypes/richfaces-archetype-simpleapp/pom.xml
===================================================================
--- trunk/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -5,6 +5,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../../build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/archetypes/richfaces-component/pom.xml
===================================================================
--- trunk/archetypes/richfaces-component/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/archetypes/richfaces-component/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -23,6 +23,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../../build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/archetypes/richfaces-component-short/pom.xml
===================================================================
--- trunk/archetypes/richfaces-component-short/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/archetypes/richfaces-component-short/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -23,6 +23,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../../build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/archetypes/richfaces-components-aggregator/pom.xml
===================================================================
--- trunk/archetypes/richfaces-components-aggregator/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/archetypes/richfaces-components-aggregator/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -23,6 +23,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../../build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/bom/pom.xml
===================================================================
--- trunk/bom/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/bom/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -31,15 +31,14 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../build/parent/pom.xml</relativePath>
</parent>
<description>
- The RichFaces "Bill of Materials". This defines all runtime dependency
- versions for RichFaces.
+ The RichFaces "Bill of Materials". This defines all runtime dependency
+ versions for RichFaces.
</description>
- <url>http://www.jboss.org/richfaces</url>
-
<properties>
</properties>
@@ -223,102 +222,6 @@
</dependencies>
</dependencyManagement>
- <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>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <scope>test</scope>
- </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>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <scope>test</scope>
- </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>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- <scope>test</scope>
- </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>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>2.0.2-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/build/bom</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/build/bom</developerConnection>
Modified: trunk/cdk/annotations/pom.xml
===================================================================
--- trunk/cdk/annotations/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/cdk/annotations/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -13,9 +13,5 @@
<description>That project contains annotations for JSF classes</description>
<name>annotations</name>
<dependencies>
- <dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
- </dependency>
</dependencies>
</project>
Modified: trunk/cdk/generator/pom.xml
===================================================================
--- trunk/cdk/generator/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/cdk/generator/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -124,9 +124,15 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
- <dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
+ <dependency>
+ <!-- This must not be inherited from parent/bom it must be set to
+ not be "provided" even though it is provided by container
+ this is building a maven plugin that runs outside of container
+ TODO A better place for this may be needed, cdk-parent/cdk-bom?
+ -->
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>2.0.2</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
Modified: trunk/cdk/parent/pom.xml
===================================================================
--- trunk/cdk/parent/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/cdk/parent/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -5,8 +5,9 @@
<parent>
<groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>9</version>
+ <artifactId>richfaces-root-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -20,39 +21,13 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <richfaces.checkstyle.version>1</richfaces.checkstyle.version>
</properties>
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/cdk/parent</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/cdk/parent</developerConnection>
<url>http://fisheye.jboss.org/browse/Richfaces/cdk/parent</url>
</scm>
- <repositories>
- <repository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>maven-repository2.dev.java.net</id>
- <name>Java.net Repository for Maven 2</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- <repository>
- <id>repository.jboss.org</id>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<pluginManagement>
<plugins>
@@ -146,22 +121,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
- <version>${jsf2.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>org.jboss.el</groupId>
<artifactId>jboss-el</artifactId>
<version>1.0_02.CR4</version>
@@ -189,11 +148,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>r05</version>
- </dependency>
- <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>2.0</version>
@@ -274,11 +228,6 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>org.richfaces.core</groupId>
- <artifactId>richfaces-core-impl</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.5.8</version>
Modified: trunk/cdk/pom.xml
===================================================================
--- trunk/cdk/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/cdk/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -6,6 +6,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/core/parent/pom.xml
===================================================================
--- trunk/core/parent/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/core/parent/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -28,9 +28,9 @@
<parent>
<groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
+ <artifactId>richfaces-root-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../../bom/pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<description>
@@ -38,39 +38,11 @@
</description>
<properties>
- <richfaces.checkstyle.version>1</richfaces.checkstyle.version>
</properties>
<dependencyManagement>
- <dependencies>
- <!-- Test Dependencies -->
- <!--
- These dependencies are usually provided by
- org.jboss.test-jsf:htmlunit-client, but the latest 2.7
- HtmlUnit version has problems with jQuery, so we are
- overriding version back to 2.5.
- -->
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit-core-js</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.5.2</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ </dependencies>
</dependencyManagement>
<build>
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/core/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -24,6 +24,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.core</groupId>
Modified: trunk/dist/pom.xml
===================================================================
--- trunk/dist/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/dist/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -23,9 +23,9 @@
<parent>
<groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
+ <artifactId>richfaces-root-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../bom/pom.xml</relativePath>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces</groupId>
Modified: trunk/examples/core-demo/pom.xml
===================================================================
--- trunk/examples/core-demo/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/examples/core-demo/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -24,9 +24,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>10-SNAPSHOT</version>
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>richfaces-example-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.examples</groupId>
@@ -36,26 +37,10 @@
<name>RichFaces Examples: Core</name>
<properties>
- <!-- FIXME - these should be from the parent -->
- <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository>
- <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.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version>
</properties>
<dependencyManagement>
<dependencies>
- <dependency>
- <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
@@ -76,16 +61,7 @@
</dependencyManagement>
<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.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
@@ -134,18 +110,6 @@
<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>
</build>
@@ -254,18 +218,6 @@
</profile>
</profiles>
- <repositories>
- <!-- FIXME - should come from parent I believe -->
- <repository>
- <id>maven-repository2.dev.java.net</id>
- <name>Java.net Repository for Maven 2</name>
- <url>http://download.java.net/maven/2</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/examples/core-demo</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/examples/core-demo</developerConnection>
Modified: trunk/examples/input-demo/pom.xml
===================================================================
--- trunk/examples/input-demo/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/examples/input-demo/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -3,9 +3,10 @@
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-SNAPSHOT</version>
+ <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>
@@ -16,37 +17,10 @@
<name>Richfaces Examples: Inputs</name>
<packaging>war</packaging>
- <url>http://jboss.org/richfaces</url>
-
- <repositories>
- <repository>
- <id>jboss-public-repository-group</id>
- <name>Jboss Repository for Maven</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>java-net</id>
- <name>Java.net Maven Repository</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- </repositories>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <org.richfaces.ui.version>4.0.0-SNAPSHOT</org.richfaces.ui.version>
- </properties>
-
<build>
<finalName>${artifactId}-${project.version}</finalName>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.1-beta-1</version>
<configuration>
@@ -78,15 +52,15 @@
<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>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>
@@ -128,39 +102,18 @@
</build>
</profile>
</profiles>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
- <version>${version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
+
<dependencies>
<dependency>
- <groupId>org.richfaces.ui.input</groupId>
- <artifactId>richfaces-ui-input-ui</artifactId>
- </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>
- <!-- 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.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
@@ -194,7 +147,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: trunk/examples/iteration-demo/pom.xml
===================================================================
--- trunk/examples/iteration-demo/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/examples/iteration-demo/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -19,15 +19,15 @@
-->
<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"
->
+ 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-SNAPSHOT</version>
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>richfaces-example-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.examples</groupId>
@@ -37,23 +37,10 @@
<name>RichFaces Examples: Iteration</name>
<properties>
- <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository>
- <jetty.port>8080</jetty.port>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <richfaces.checkstyle.version>1</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>
-
<!--
simple logger binding: only messages of level INFO and
higher are printed
@@ -82,9 +69,9 @@
<groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-ui</artifactId>
</dependency>
- <dependency>
- <groupId>org.richfaces.ui.misc</groupId>
- <artifactId>richfaces-ui-misc-ui</artifactId>
+ <dependency>
+ <groupId>org.richfaces.ui.misc</groupId>
+ <artifactId>richfaces-ui-misc-ui</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -109,16 +96,7 @@
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
- <!-- JSF -->
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
@@ -159,18 +137,6 @@
<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>
</build>
@@ -198,15 +164,4 @@
</dependencies>
</profile>
</profiles>
-
- <repositories>
- <repository>
- <id>maven-repository2.dev.java.net</id>
- <name>Java.net Repository for Maven 2</name>
- <url>http://download.java.net/maven/2</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
</project>
Modified: trunk/examples/misc-demo/pom.xml
===================================================================
--- trunk/examples/misc-demo/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/examples/misc-demo/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -25,9 +25,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>10-SNAPSHOT</version>
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>richfaces-example-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.examples</groupId>
@@ -37,23 +38,10 @@
<name>RichFaces Examples: Miscellanous</name>
<properties>
- <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository>
- <jetty.port>8080</jetty.port>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <richfaces.checkstyle.version>1</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>
-
<!--
simple logger binding: only messages of level INFO and
higher are printed
@@ -87,16 +75,7 @@
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-impl</artifactId>
</dependency>
-
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
@@ -166,30 +145,7 @@
<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>
</build>
-
- <repositories>
- <repository>
- <id>maven-repository2.dev.java.net</id>
- <name>Java.net Repository for Maven 2</name>
- <url>http://download.java.net/maven/2</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
</project>
Modified: trunk/examples/output-demo/pom.xml
===================================================================
--- trunk/examples/output-demo/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/examples/output-demo/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -4,9 +4,10 @@
>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>10-SNAPSHOT</version>
+ <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>
@@ -17,36 +18,13 @@
<name>Richfaces Examples: Outputs</name>
<packaging>war</packaging>
- <url>http://jboss.org/richfaces</url>
-
- <repositories>
- <repository>
- <id>jboss-public-repository-group</id>
- <name>Jboss Repository for Maven</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>java-net</id>
- <name>Java.net Maven Repository</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- </repositories>
-
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
<finalName>${artifactId}-${project.version}</finalName>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.1-beta-1</version>
<configuration>
@@ -130,18 +108,6 @@
</profile>
</profiles>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.richfaces.ui.output</groupId>
@@ -153,14 +119,6 @@
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
Copied: trunk/examples/parent (from rev 18827, branches/RF-9112/examples/parent)
Deleted: trunk/examples/parent/pom.xml
===================================================================
--- branches/RF-9112/examples/parent/pom.xml 2010-08-19 19:33:16 UTC (rev 18827)
+++ trunk/examples/parent/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -1,227 +0,0 @@
-<?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-SNAPSHOT</version>
- </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-SNAPSHOT</richfaces.checkstyle.version>
- <org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
- <version>${org.richfaces.bom.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>
-</project>
\ No newline at end of file
Copied: trunk/examples/parent/pom.xml (from rev 18827, branches/RF-9112/examples/parent/pom.xml)
===================================================================
--- trunk/examples/parent/pom.xml (rev 0)
+++ trunk/examples/parent/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -0,0 +1,226 @@
+<?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-SNAPSHOT</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-SNAPSHOT</richfaces.checkstyle.version>
+ <org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-bom</artifactId>
+ <version>${org.richfaces.bom.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>
+</project>
\ No newline at end of file
Modified: trunk/examples/pom.xml
===================================================================
--- trunk/examples/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/examples/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -29,6 +29,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.examples</groupId>
@@ -38,6 +39,7 @@
<name>RichFaces Examples: Aggregator</name>
<modules>
+ <module>parent</module>
<module>core-demo</module>
<module>misc-demo</module>
<module>output-demo</module>
@@ -48,4 +50,4 @@
<!--<module>dist</module>-->
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/examples/repeater-demo/pom.xml
===================================================================
--- trunk/examples/repeater-demo/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/examples/repeater-demo/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -26,9 +26,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>10-SNAPSHOT</version>
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>richfaces-example-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.examples</groupId>
@@ -38,23 +39,10 @@
<name>Richfaces Examples: Repeater</name>
<properties>
- <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository>
- <jetty.port>8080</jetty.port>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <richfaces.checkstyle.version>1</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>
-
<!--
simple logger binding: only messages of level INFO and
higher are printed
@@ -76,14 +64,6 @@
<dependencies>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
@@ -105,6 +85,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>4.7</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -144,30 +125,7 @@
<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>
</build>
-
- <repositories>
- <repository>
- <id>maven-repository2.dev.java.net</id>
- <name>Java.net Repository for Maven 2</name>
- <url>http://download.java.net/maven/2</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
</project>
Modified: trunk/examples/richfaces-showcase/pom.xml
===================================================================
--- trunk/examples/richfaces-showcase/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/examples/richfaces-showcase/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -6,9 +6,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>10-SNAPSHOT</version>
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>richfaces-example-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.examples</groupId>
@@ -17,67 +18,39 @@
<packaging>war</packaging>
<name>Richfaces Examples: Richfaces Showcase Application</name>
- <properties>
- <!-- FIXME these should be through the richfaces-parent -->
- <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <properties>
+ </properties>
- <jetty.port>8080</jetty.port>
- <richfaces.checkstyle.version>1</richfaces.checkstyle.version>
- <org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version>
- </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-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>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
- <version>${org.richfaces.bom.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
<dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-components-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-components-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
-
- <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
@@ -408,18 +381,6 @@
</profile>
</profiles>
- <repositories>
- <!-- FIXME - This should be set globally in parent -->
- <repository>
- <id>maven-repository2.dev.java.net</id>
- <name>Java.net Repository for Maven 2</name>
- <url>http://download.java.net/maven/2</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/examples/richfaces-showcase</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/examples/richfaces-showcase</developerConnection>
Copied: trunk/parent (from rev 18792, branches/RF-9112/parent)
Deleted: trunk/parent/pom.xml
===================================================================
--- branches/RF-9112/parent/pom.xml 2010-08-19 01:31:22 UTC (rev 18792)
+++ trunk/parent/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -1,301 +0,0 @@
-
- <!--
- JBoss, Home of Professional Open Source Copyright 2010, Red Hat, Inc.
- and individual contributors by the @authors tag. See the copyright.txt
- in the distribution for a full listing of individual contributors. This
- is free software; you can redistribute it and/or modify it under the
- terms of the GNU Lesser General Public License as published by the Free
- Software Foundation; either version 2.1 of the License, or (at your
- option) any later version. This software is distributed in the hope that
- it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details. You should have
- received a copy of the GNU Lesser General Public License along with this
- software; if not, write to the Free Software Foundation, Inc., 51
- Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
- site: http://www.fsf.org.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-root-parent</artifactId>
- <packaging>pom</packaging>
- <version>4.0.0-SNAPSHOT</version>
- <name>RichFaces Root Parent</name>
-
- <parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>10-SNAPSHOT</version>
- </parent>
-
- <description>
- This is the root parent for the richfaces project that is released with the project, and contains pluginmangement, and common testing dependency management elements.
- </description>
-
- <url>http://richfaces.org</url>
-
- <properties>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <!-- Override the default 2.0.9 from jboss-parent -->
- <maven.min.version>2.1.0</maven.min.version>
- <richfaces.checkstyle.version>2-SNAPSHOT</richfaces.checkstyle.version>
- </properties>
-
-
- <dependencyManagement>
- <dependencies>
- <!-- Archetypes dependency -->
- <dependency>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-4</version>
- </dependency>
-
- <!-- tests -->
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>htmlunit-client</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>jsf-mock</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>jsf-test-stage</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <!-- Build -->
- <build>
- <!--
- Plugin config, including versions to use in the build. Note: some
- are inherited from jboss-parent
- -->
- <pluginManagement>
- <plugins>
- <!-- Release -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <!-- All sub-modules will have same version -->
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <!-- During release:perform, enable the "release" profile -->
- <releaseProfiles>release</releaseProfiles>
- <!-- Some modules (dist) need release items installed during prepare -->
- <preparationGoals>clean install</preparationGoals>
- <!--
- RichFaces modules should override and set goals to
- run for release:perform
- -->
- <!-- <goals></goals> -->
- </configuration>
- </plugin>
-
-
- <!-- 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.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
-
- <!-- reporting -->
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- </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>
-
- <!-- dev -->
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <wtpversion>2.0</wtpversion>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
-
- <!--
- docs TODO should move to profiles probably a "doc" profile
- -->
- <plugin>
- <groupId>gr.abiss.mvn.plugins</groupId>
- <artifactId>maven-jstools-plugin</artifactId>
- <version>0.7</version>
- <configuration>
- <jsDir>${project.basedir}/src/main/resources/META-INF/resources
- </jsDir>
- <includes>**/*.js</includes>
- <caseSensitive>true</caseSensitive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <!-- For the release this parent pom -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <inherited>false</inherited>
- </plugin>
- </plugins>
- </build>
-
- <!-- Profiles -->
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <!-- TODO move to doc profile? -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <javadocVersion>1.5</javadocVersion>
- <aggregate>true</aggregate>
- </configuration>
- <executions>
- <execution>
- <id>generate-javadoc</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!--
- Triggers generated documentation as part of builds ( javadoc,
- jsdoc, etc...
- -->
- <id>doc</id>
- <!-- TODO -->
- </profile>
- <profile>
- <!-- Triggers clover reports to be generated -->
- <id>clover</id>
- <build>
- <plugins>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <licenseLocation>
- ${clover.license.path}
- </licenseLocation>
- <jdk>1.5</jdk>
- <generatePdf>false</generatePdf>
- <generateXml>true</generateXml>
- <generateHtml>true</generateHtml>
- </configuration>
- <executions>
- <execution>
- <id>instrument</id>
- <phase>verify</phase>
- <goals>
- <goal>instrument</goal>
- <goal>check</goal>
- <goal>clover</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!-- Required when in JBoss hudson env to have clover reports generate -->
- <id>hudson</id>
- <properties>
- <clover.license.path>/home/hudson/config_repository/resources/richfaces/richfaces-clover-license.txt
- </clover.license.path>
- </properties>
- </profile>
- </profiles>
-
- <!-- SCM and distribution management -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/parent
- </connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/parent
- </developerConnection>
- <url>http://fisheye.jboss.org/browse/richfaces/trunk/parent</url>
- </scm>
-
-</project>
Copied: trunk/parent/pom.xml (from rev 18792, branches/RF-9112/parent/pom.xml)
===================================================================
--- trunk/parent/pom.xml (rev 0)
+++ trunk/parent/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -0,0 +1,404 @@
+
+ <!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-root-parent</artifactId>
+ <packaging>pom</packaging>
+ <version>4.0.0-SNAPSHOT</version>
+ <name>RichFaces Root Parent</name>
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-bom</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../bom/pom.xml</relativePath>
+
+ </parent>
+
+ <description>
+ This is the root parent for the richfaces project that is released with
+ the project, and contains pluginmangement, and common testing dependency
+ management elements.
+ </description>
+
+ <properties>
+ <richfaces.checkstyle.version>2-SNAPSHOT</richfaces.checkstyle.version>
+ </properties>
+
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Archetypes dependency -->
+ <dependency>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.0-alpha-4</version>
+ </dependency>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>htmlunit-client</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-mock</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-test-stage</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-test-jetty</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ </dependency>
+ <!-- Test Dependencies -->
+ <!--
+ These dependencies are usually provided by
+ org.jboss.test-jsf:htmlunit-client, but the latest 2.7
+ HtmlUnit version has problems with jQuery, so we are
+ overriding version back to 2.5.
+ -->
+<!-- <dependency>-->
+<!-- <groupId>net.sourceforge.htmlunit</groupId>-->
+<!-- <artifactId>htmlunit</artifactId>-->
+<!-- <version>2.8</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>net.sourceforge.htmlunit</groupId>-->
+<!-- <artifactId>htmlunit-core-js</artifactId>-->
+<!-- <version>2.8</version>-->
+<!-- </dependency>-->
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.5.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Build -->
+ <build>
+ <!--
+ PluginManagement config, including versions to use in the
+ build. Note: some are inherited from jboss-parent, others
+ from richfaces-parent
+ -->
+ <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.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+
+ <!-- reporting -->
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ </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>
+ <!--
+ docs TODO should move to profiles probably a "doc"
+ profile
+ -->
+ <plugin>
+ <groupId>gr.abiss.mvn.plugins</groupId>
+ <artifactId>maven-jstools-plugin</artifactId>
+ <version>0.7</version>
+ <configuration>
+ <jsDir>${project.basedir}/src/main/resources/META-INF/resources
+ </jsDir>
+ <includes>**/*.js</includes>
+ <caseSensitive>true</caseSensitive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <!-- For the release this parent pom -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <inherited>false</inherited>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- TODO move to doc profile? -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <javadocVersion>1.5</javadocVersion>
+ <aggregate>true</aggregate>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-javadoc</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <!--
+ Triggers generated documentation as part of builds (
+ javadoc, jsdoc, etc...
+ -->
+ <id>doc</id>
+ <!-- TODO -->
+ </profile>
+ <profile>
+ <!-- Triggers clover reports to be generated -->
+ <id>clover</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <configuration>
+ <licenseLocation>
+ ${clover.license.path}
+ </licenseLocation>
+ <jdk>1.5</jdk>
+ <generatePdf>false</generatePdf>
+ <generateXml>true</generateXml>
+ <generateHtml>true</generateHtml>
+ </configuration>
+ <executions>
+ <execution>
+ <id>instrument</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>instrument</goal>
+ <goal>check</goal>
+ <goal>clover</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <!--
+ Required when in JBoss hudson env to have clover reports
+ generate
+ -->
+ <id>hudson</id>
+ <properties>
+ <clover.license.path>
+ /home/hudson/config_repository/resources/richfaces/richfaces-clover-license.txt
+ </clover.license.path>
+ </properties>
+ </profile>
+
+ <!--
+ 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>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>test</scope>
+ </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>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jsf_ri_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>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </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>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>2.0.2-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+ <!-- SCM and distribution management -->
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/parent
+ </connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/parent
+ </developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/trunk/parent</url>
+ </scm>
+
+</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -8,17 +8,19 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
- <artifactId>root</artifactId>
+ <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>
Modified: trunk/ui/common/pom.xml
===================================================================
--- trunk/ui/common/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/ui/common/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -23,10 +23,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-parent</artifactId>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-root-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui.common</groupId>
Modified: trunk/ui/core/api/pom.xml
===================================================================
--- trunk/ui/core/api/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/ui/core/api/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -22,6 +22,7 @@
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/ui/core/pom.xml
===================================================================
--- trunk/ui/core/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/ui/core/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -23,12 +23,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-parent</artifactId>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-root-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
-
+
<groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
Modified: trunk/ui/dist/pom.xml
===================================================================
--- trunk/ui/dist/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/ui/dist/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -20,10 +20,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-parent</artifactId>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-root-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: trunk/ui/dist/richfaces-components-api/pom.xml
===================================================================
--- trunk/ui/dist/richfaces-components-api/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/ui/dist/richfaces-components-api/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -36,7 +36,7 @@
<properties>
<assembly.projects.group>org.richfaces.ui</assembly.projects.group>
- <faces-shade-transformers.version>2</faces-shade-transformers.version>
+ <faces-shade-transformers.version>3-SNAPSHOT</faces-shade-transformers.version>
</properties>
<dependencies>
Modified: trunk/ui/dist/richfaces-components-ui/pom.xml
===================================================================
--- trunk/ui/dist/richfaces-components-ui/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/ui/dist/richfaces-components-ui/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -35,7 +35,7 @@
<name>Richfaces UI Components UI</name>
<properties>
- <faces-shade-transformers.version>2</faces-shade-transformers.version>
+ <faces-shade-transformers.version>3-SNAPSHOT</faces-shade-transformers.version>
<assembly.projects.group>org.richfaces.ui</assembly.projects.group>
</properties>
Modified: trunk/ui/input/pom.xml
===================================================================
--- trunk/ui/input/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/ui/input/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -23,10 +23,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-parent</artifactId>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-root-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui.input</groupId>
Modified: trunk/ui/iteration/pom.xml
===================================================================
--- trunk/ui/iteration/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/ui/iteration/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -23,10 +23,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-parent</artifactId>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-root-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui.iteration</groupId>
Modified: trunk/ui/misc/pom.xml
===================================================================
--- trunk/ui/misc/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/ui/misc/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -25,10 +25,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-parent</artifactId>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-root-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui.misc</groupId>
Modified: trunk/ui/misc/ui/pom.xml
===================================================================
--- trunk/ui/misc/ui/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/ui/misc/ui/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -46,7 +46,6 @@
<properties>
<assembly.projects.group>org.richfaces.ui.misc</assembly.projects.group>
- <faces-shade-transformers.version>2</faces-shade-transformers.version>
</properties>
<dependencies>
Modified: trunk/ui/output/pom.xml
===================================================================
--- trunk/ui/output/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/ui/output/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -23,10 +23,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-parent</artifactId>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-root-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui.output</groupId>
Modified: trunk/ui/parent/pom.xml
===================================================================
--- trunk/ui/parent/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/ui/parent/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -26,9 +26,9 @@
<parent>
<groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
+ <artifactId>richfaces-root-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../../bom/pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui</groupId>
@@ -54,12 +54,6 @@
<version>1.0-beta-2</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-4</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
<version>${project.version}</version>
Modified: trunk/ui/pom.xml
===================================================================
--- trunk/ui/pom.xml 2010-08-20 15:54:52 UTC (rev 18853)
+++ trunk/ui/pom.xml 2010-08-20 16:18:06 UTC (rev 18854)
@@ -29,6 +29,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui</groupId>
More information about the richfaces-svn-commits
mailing list