Author: Alex.Kolonitsky Date: 2010-05-10 12:36:05 -0400 (Mon, 10 May 2010) New Revision: 16959 Modified: root/examples/core-demo/trunk/pom.xml root/examples/pom.xml root/examples/richfaces-demo/trunk/pom.xml Log: change richfaces build structure https://community.jboss.org/wiki/RichFaces40BuildDirectoryStructure restructured ui Modified: root/examples/core-demo/trunk/pom.xml =================================================================== --- root/examples/core-demo/trunk/pom.xml 2010-05-10 15:26:22 UTC (rev 16958) +++ root/examples/core-demo/trunk/pom.xml 2010-05-10 16:36:05 UTC (rev 16959) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces.examples</groupId> - <artifactId>components</artifactId> + <artifactId>root</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> @@ -33,13 +33,15 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.examples.components</groupId> <artifactId>${example.componentName}-demo</artifactId> + <version>4.0.0-SNAPSHOT</version> <packaging>war</packaging> <name>RichFaces core demo</name> <dependencies> <dependency> - <groupId>org.richfaces.ui.components</groupId> - <artifactId>${example.componentName}-ui</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>${example.componentName}</artifactId> + <version>4.0.0-SNAPSHOT</version> </dependency> <dependency> @@ -60,4 +62,22 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-eclipse-plugin</artifactId> + <configuration> + <wtpversion>2.0</wtpversion> + <downloadSources>true</downloadSources> + </configuration> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: root/examples/pom.xml =================================================================== --- root/examples/pom.xml 2010-05-10 15:26:22 UTC (rev 16958) +++ root/examples/pom.xml 2010-05-10 16:36:05 UTC (rev 16959) @@ -19,8 +19,187 @@ </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> + </properties> + + <distributionManagement> + <downloadUrl> + http://labs.jboss.com/portal/jbossrichfaces/downloads + </downloadUrl> + <repository> + <id>jboss-releases-repository</id> + <uniqueVersion>false</uniqueVersion> + <url>${releaseRepository}</url> + </repository> <snapshotRepository> - dav:https://repository.jboss.org/nexus/content/repositories/snapshots/ + <id>jboss-snapshots-repository</id> + <uniqueVersion>true</uniqueVersion> + <url>${snapshotRepository}</url> </snapshotRepository> - </properties> + <!--site> + <url>file:target/site2</url> + </site--> + </distributionManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>4.0.0-SNAPSHOT</version> + </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> + + <!-- TODO: uncomment when assembly will be ready --> + <!--dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>${ui.version}</version> + </dependency--> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.3-SNAPSHOT</version> + <!--scope>provided</scope--> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.3-SNAPSHOT</version> + <!--scope>provided</scope--> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.2</version> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>jee5</id> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.3-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.3-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> + + <build> + <plugins> + <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> + <plugin> + <artifactId>maven-eclipse-plugin</artifactId> + <configuration> + <wtpversion>2.0</wtpversion> + <downloadSources>true</downloadSources> + </configuration> + </plugin> + <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-checkstyle-plugin</artifactId> + <version>2.3</version> + + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>checkstyle</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <executions> + <execution> + <id>richfaces-checkstyle-report</id> + <configuration> + <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation> + <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> + </configuration> + + <phase>process-sources</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.3</version> + + <configuration> + <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation> + <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> + </configuration> + </plugin> + </plugins> + </reporting> </project> \ No newline at end of file Modified: root/examples/richfaces-demo/trunk/pom.xml =================================================================== --- root/examples/richfaces-demo/trunk/pom.xml 2010-05-10 15:26:22 UTC (rev 16958) +++ root/examples/richfaces-demo/trunk/pom.xml 2010-05-10 16:36:05 UTC (rev 16959) @@ -34,9 +34,9 @@ <dependencies> <dependency> - <groupId>org.richfaces.ui.components</groupId> - <artifactId>core-ui</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>4.0.0-SNAPSHOT</version> </dependency> <dependency>