[richfaces-svn-commits] JBoss Rich Faces SVN: r18827 - in branches/RF-9112/examples: core-demo and 8 other directories.

Author: jbalunas(a)redhat.com Date: 2010-08-19 15:33:16 -0400 (Thu, 19 Aug 2010) New Revision: 18827 Added: branches/RF-9112/examples/parent/ branches/RF-9112/examples/parent/pom.xml Modified: branches/RF-9112/examples/core-demo/pom.xml branches/RF-9112/examples/input-demo/pom.xml branches/RF-9112/examples/iteration-demo/pom.xml branches/RF-9112/examples/misc-demo/pom.xml branches/RF-9112/examples/output-demo/pom.xml branches/RF-9112/examples/pom.xml branches/RF-9112/examples/repeater-demo/pom.xml branches/RF-9112/examples/richfaces-showcase/pom.xml branches/RF-9112/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml Log: RF-9069,RF-9112 Created parent for examples Modified: branches/RF-9112/examples/core-demo/pom.xml =================================================================== --- branches/RF-9112/examples/core-demo/pom.xml 2010-08-19 18:46:38 UTC (rev 18826) +++ branches/RF-9112/examples/core-demo/pom.xml 2010-08-19 19:33:16 UTC (rev 18827) @@ -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/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.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/exam... <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... Modified: branches/RF-9112/examples/input-demo/pom.xml =================================================================== --- branches/RF-9112/examples/input-demo/pom.xml 2010-08-19 18:46:38 UTC (rev 18826) +++ branches/RF-9112/examples/input-demo/pom.xml 2010-08-19 19:33:16 UTC (rev 18827) @@ -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: branches/RF-9112/examples/iteration-demo/pom.xml =================================================================== --- branches/RF-9112/examples/iteration-demo/pom.xml 2010-08-19 18:46:38 UTC (rev 18826) +++ branches/RF-9112/examples/iteration-demo/pom.xml 2010-08-19 19:33:16 UTC (rev 18827) @@ -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/repo... - <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: branches/RF-9112/examples/misc-demo/pom.xml =================================================================== --- branches/RF-9112/examples/misc-demo/pom.xml 2010-08-19 18:46:38 UTC (rev 18826) +++ branches/RF-9112/examples/misc-demo/pom.xml 2010-08-19 19:33:16 UTC (rev 18827) @@ -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/repo... - <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: branches/RF-9112/examples/output-demo/pom.xml =================================================================== --- branches/RF-9112/examples/output-demo/pom.xml 2010-08-19 18:46:38 UTC (rev 18826) +++ branches/RF-9112/examples/output-demo/pom.xml 2010-08-19 19:33:16 UTC (rev 18827) @@ -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> Added: branches/RF-9112/examples/parent/pom.xml =================================================================== --- branches/RF-9112/examples/parent/pom.xml (rev 0) +++ branches/RF-9112/examples/parent/pom.xml 2010-08-19 19:33:16 UTC (rev 18827) @@ -0,0 +1,227 @@ +<?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 Modified: branches/RF-9112/examples/pom.xml =================================================================== --- branches/RF-9112/examples/pom.xml 2010-08-19 18:46:38 UTC (rev 18826) +++ branches/RF-9112/examples/pom.xml 2010-08-19 19:33:16 UTC (rev 18827) @@ -38,6 +38,7 @@ <name>RichFaces Examples: Aggregator</name> <modules> + <module>parent</module> <module>core-demo</module> <module>misc-demo</module> <module>output-demo</module> Modified: branches/RF-9112/examples/repeater-demo/pom.xml =================================================================== --- branches/RF-9112/examples/repeater-demo/pom.xml 2010-08-19 18:46:38 UTC (rev 18826) +++ branches/RF-9112/examples/repeater-demo/pom.xml 2010-08-19 19:33:16 UTC (rev 18827) @@ -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/repo... - <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> @@ -145,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: branches/RF-9112/examples/richfaces-showcase/pom.xml =================================================================== --- branches/RF-9112/examples/richfaces-showcase/pom.xml 2010-08-19 18:46:38 UTC (rev 18826) +++ branches/RF-9112/examples/richfaces-showcase/pom.xml 2010-08-19 19:33:16 UTC (rev 18827) @@ -5,11 +5,12 @@ <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>10-SNAPSHOT</version> - </parent> + <parent> + <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> <artifactId>richfaces-showcase</artifactId> @@ -18,28 +19,8 @@ <name>Richfaces Examples: Richfaces Showcase Application</name> <properties> - <!-- FIXME these should be through the richfaces-parent --> - <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.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> - <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> @@ -50,14 +31,6 @@ <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> @@ -275,18 +248,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/exam... <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... Modified: branches/RF-9112/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/RF-9112/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml 2010-08-19 18:46:38 UTC (rev 18826) +++ branches/RF-9112/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml 2010-08-19 19:33:16 UTC (rev 18827) @@ -23,9 +23,13 @@ </context-param> <context-param> <param-name>org.richfaces.skin</param-name> + <param-value>blueSky</param-value> + </context-param><!-- + <context-param> + <param-name>org.richfaces.skin</param-name> <param-value>#{skinBean.skin}</param-value> </context-param> - <context-param> + --><context-param> <param-name>javax.faces.PROJECT_STAGE</param-name> <param-value>Development</param-value> </context-param>