Author: Alex.Kolonitsky Date: 2010-06-02 10:26:06 -0400 (Wed, 02 Jun 2010) New Revision: 17463 Modified: root/examples/core-demo/trunk/pom.xml root/examples/iteration-demo/trunk/pom.xml root/examples/misc-demo/trunk/pom.xml root/examples/pom.xml root/examples/repeater-demo/trunk/pom.xml root/examples/richfaces-showcase/trunk/pom.xml root/ui/dist/trunk/richfaces-components-ui/pom.xml root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml Log: correct dependencies for richfaces-showcase simplify examples aggregator module Modified: root/examples/core-demo/trunk/pom.xml =================================================================== --- root/examples/core-demo/trunk/pom.xml 2010-06-02 08:16:02 UTC (rev 17462) +++ root/examples/core-demo/trunk/pom.xml 2010-06-02 14:26:06 UTC (rev 17463) @@ -24,18 +24,88 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.examples</groupId> - <artifactId>examples-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>7</version> </parent> <groupId>org.richfaces.examples</groupId> <artifactId>core-demo</artifactId> <packaging>war</packaging> + <version>4.0.0-SNAPSHOT</version> <name>RichFaces Examples: Core</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.ui</groupId> + <artifactId>richfaces-ui-core-bom</artifactId> + <version>${project.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-misc-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--> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.8</version> + </dependency> + + <!-- Log4J dependency used in examples --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> + <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-core-ui</artifactId> </dependency> @@ -48,12 +118,55 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> </dependencies> + <build> + <pluginManagement> + <plugins> + <plugin> + <!-- Configure checkstyle report for this module --> + <artifactId>maven-checkstyle-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-build-checkstyle + </artifactId> + <version>${richfaces.checkstyle.version} + </version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + </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> + </build> + <profiles> <profile> <id>release</id> @@ -129,6 +242,36 @@ </plugin> </plugins> </build> + + <dependencies> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </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> \ No newline at end of file Modified: root/examples/iteration-demo/trunk/pom.xml =================================================================== --- root/examples/iteration-demo/trunk/pom.xml 2010-06-02 08:16:02 UTC (rev 17462) +++ root/examples/iteration-demo/trunk/pom.xml 2010-06-02 14:26:06 UTC (rev 17463) @@ -24,25 +24,62 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.examples</groupId> - <artifactId>examples-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>7</version> </parent> <groupId>org.richfaces.examples</groupId> <artifactId>iteration-demo</artifactId> <packaging>war</packaging> + <version>4.0.0-SNAPSHOT</version> <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.ui</groupId> + <artifactId>richfaces-ui-core-bom</artifactId> + <version>${project.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-misc-bom</artifactId> + <version>${project.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-iteration-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--> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.8</version> + </dependency> + + <!-- Log4J dependency used in examples --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> </dependencies> </dependencyManagement> @@ -106,6 +143,24 @@ </dependencies> <build> + <pluginManagement> + <plugins> + <plugin> + <!-- Configure checkstyle report for this module --> + <artifactId>maven-checkstyle-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-build-checkstyle + </artifactId> + <version>${richfaces.checkstyle.version} + </version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -114,7 +169,62 @@ <configuration> <fail>false</fail> </configuration> - </plugin> - </plugins> + </plugin> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + </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> </build> + + <profiles> + <profile> + <id>jee6</id> + <dependencies> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </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> \ No newline at end of file Modified: root/examples/misc-demo/trunk/pom.xml =================================================================== --- root/examples/misc-demo/trunk/pom.xml 2010-06-02 08:16:02 UTC (rev 17462) +++ root/examples/misc-demo/trunk/pom.xml 2010-06-02 14:26:06 UTC (rev 17463) @@ -24,16 +24,59 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.examples</groupId> - <artifactId>examples-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>7</version> </parent> <groupId>org.richfaces.examples</groupId> <artifactId>misc-demo</artifactId> + <version>4.0.0-SNAPSHOT</version> <packaging>war</packaging> <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.ui</groupId> + <artifactId>richfaces-ui-core-bom</artifactId> + <version>${project.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-misc-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--> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.8</version> + </dependency> + + <!-- Log4J dependency used in examples --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> @@ -41,6 +84,34 @@ </dependency> <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</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> @@ -54,4 +125,82 @@ <scope>provided</scope> </dependency> </dependencies> + + <profiles> + <profile> + <id>jee6</id> + <dependencies> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> + + <build> + <pluginManagement> + <plugins> + <plugin> + <!-- Configure checkstyle report for this module --> + <artifactId>maven-checkstyle-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-build-checkstyle + </artifactId> + <version>${richfaces.checkstyle.version} + </version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + </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> + </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> \ No newline at end of file Modified: root/examples/pom.xml =================================================================== --- root/examples/pom.xml 2010-06-02 08:16:02 UTC (rev 17462) +++ root/examples/pom.xml 2010-06-02 14:26:06 UTC (rev 17463) @@ -26,9 +26,9 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>6</version> + <version>7</version> </parent> - + <groupId>org.richfaces.examples</groupId> <artifactId>examples-aggregator</artifactId> <version>4.0.0-SNAPSHOT</version> @@ -44,153 +44,4 @@ <!--<module>dist/trunk</module>--> </modules> - <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.ui</groupId> - <artifactId>richfaces-ui-core-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-misc-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--> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.8</version> - </dependency> - - <!-- Log4J dependency used in examples --> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>jee6</id> - <dependencies> - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> - - <build> - <pluginManagement> - <plugins> - <plugin> - <!-- Configure checkstyle report for this module --> - <artifactId>maven-checkstyle-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-build-checkstyle - </artifactId> - <version>${richfaces.checkstyle.version} - </version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> - - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - </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> - </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> \ No newline at end of file Modified: root/examples/repeater-demo/trunk/pom.xml =================================================================== --- root/examples/repeater-demo/trunk/pom.xml 2010-06-02 08:16:02 UTC (rev 17462) +++ root/examples/repeater-demo/trunk/pom.xml 2010-06-02 14:26:06 UTC (rev 17463) @@ -25,21 +25,169 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.examples</groupId> - <artifactId>examples-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>7</version> </parent> <groupId>org.richfaces.examples</groupId> <artifactId>repeater-demo</artifactId> <packaging>war</packaging> + <version>4.0.0-SNAPSHOT</version> <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.ui</groupId> + <artifactId>richfaces-ui-core-bom</artifactId> + <version>${project.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-misc-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--> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.8</version> + </dependency> + + <!-- Log4J dependency used in examples --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</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>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> - </dependency> + </dependency> </dependencies> + + <profiles> + <profile> + <id>jee6</id> + <dependencies> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> + + <build> + <pluginManagement> + <plugins> + <plugin> + <!-- Configure checkstyle report for this module --> + <artifactId>maven-checkstyle-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-build-checkstyle + </artifactId> + <version>${richfaces.checkstyle.version} + </version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + </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> + </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> \ No newline at end of file Modified: root/examples/richfaces-showcase/trunk/pom.xml =================================================================== --- root/examples/richfaces-showcase/trunk/pom.xml 2010-06-02 08:16:02 UTC (rev 17462) +++ root/examples/richfaces-showcase/trunk/pom.xml 2010-06-02 14:26:06 UTC (rev 17463) @@ -7,16 +7,59 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.examples</groupId> - <artifactId>examples-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>7</version> </parent> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-showcase</artifactId> + <version>4.0.0-SNAPSHOT</version> <packaging>war</packaging> <name>Richfaces Examples: Richfaces Showcase Application</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.ui</groupId> + <artifactId>richfaces-ui-core-bom</artifactId> + <version>${project.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-misc-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--> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.8</version> + </dependency> + + <!-- Log4J dependency used in examples --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> @@ -24,12 +67,52 @@ </dependency> <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-ui</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-misc-ui</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + <dependency> <groupId>org.richfaces.ui.iteration</groupId> <artifactId>datascroller-ui</artifactId> <version>4.0.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</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>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> </dependency> @@ -37,41 +120,58 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-iteration-ui</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-misc-ui</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> </dependencies> <build> <finalName>richfaces-showcase</finalName> + + <pluginManagement> + <plugins> + <plugin> + <!-- Configure checkstyle report for this module --> + <artifactId>maven-checkstyle-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-build-checkstyle + </artifactId> + <version>${richfaces.checkstyle.version} + </version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + </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> </build> <profiles> - <profile> - <id>jdk5</id> - <activation> - <jdk>1.5</jdk> - </activation> - - <dependencies> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.2</version> - </dependency> - </dependencies> - </profile> <profile> <id>release</id> <build> @@ -146,6 +246,36 @@ </plugin> </plugins> </build> + + <dependencies> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </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: root/ui/dist/trunk/richfaces-components-ui/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-02 08:16:02 UTC (rev 17462) +++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-02 14:26:06 UTC (rev 17463) @@ -135,6 +135,13 @@ <artifactId>jstl</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>4.0.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> </dependencies> <build> Modified: root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml =================================================================== --- root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-06-02 08:16:02 UTC (rev 17462) +++ root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-06-02 14:26:06 UTC (rev 17463) @@ -74,6 +74,7 @@ <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> <version>4.0.0-SNAPSHOT</version> + <scope>provided</scope> </dependency> </dependencies> @@ -199,6 +200,12 @@ </goals> <configuration> <sourcepath>${basedir}/target/dependency</sourcepath> +<!-- + <includeDependencySources>true</includeDependencySources> + <dependencySourceIncludes> + <dependencySourceInclude>${assembly.projects.group}:*-ui:*</dependencySourceInclude> + </dependencySourceIncludes> +--> </configuration> </execution> </executions>