Author: jbalunas(a)redhat.com Date: 2010-05-12 14:21:59 -0400 (Wed, 12 May 2010) New Revision: 17006 Added: root/commons/trunk/checkstyle-suppressions.xml Modified: root/build/parent/trunk/pom.xml root/commons/trunk/api/pom.xml root/commons/trunk/bom/pom.xml root/commons/trunk/parent/pom.xml root/core/trunk/bom/pom.xml root/core/trunk/impl/pom.xml root/core/trunk/pom.xml Log: Updates to build structure for core module to fit new structure Modified: root/build/parent/trunk/pom.xml =================================================================== --- root/build/parent/trunk/pom.xml 2010-05-12 17:42:44 UTC (rev 17005) +++ root/build/parent/trunk/pom.xml 2010-05-12 18:21:59 UTC (rev 17006) @@ -1,3 +1,4 @@ + <!-- JBoss, Home of Professional Open Source Copyright 2010, Red Hat, Inc. and individual contributors by the @authors tag. See the @@ -58,9 +59,6 @@ </issueManagement> <properties> - <richfaces.version>4.0.0-SNAPSHOT</richfaces.version> - - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> @@ -98,12 +96,13 @@ </snapshots> </pluginRepository> </pluginRepositories> - + <!-- Build --> <build> - <!-- Plugin config, including versions to use in the build. - Note: some are inherited from jboss-parent - --> + <!-- + Plugin config, including versions to use in the build. Note: + some are inherited from jboss-parent + --> <pluginManagement> <plugins> <!-- TODO: change to the current CDK version --> @@ -112,7 +111,7 @@ <artifactId>maven-javascript-plugin</artifactId> <version>3.3.1.GA</version> </plugin> - + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>javacc-maven-plugin</artifactId> @@ -124,82 +123,95 @@ <plugin> <groupId>com.atlassian.maven.plugins</groupId> <artifactId>maven-clover2-plugin</artifactId> - <!-- <version>2.5.1</version> --> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.3</version> + <configuration> + <skip>${skipch}</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </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-enforcer-plugin</artifactId> + <version>1.0-beta-1</version> + <executions> + <execution> + <id>enforce-versions</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireMavenVersion> + <version>2.1.0</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + </executions> + </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>gr.abiss.mvn.plugins</groupId> + <artifactId>maven-jstools-plugin</artifactId> + <version>0.7</version> + </plugin> </plugins> </pluginManagement> - <plugins> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-source</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </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-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <executions> - <execution> - <id>enforce-versions</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireMavenVersion> - <version>2.1.0</version> - </requireMavenVersion> - </rules> - </configuration> - </execution> - </executions> - </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> - </plugins> </build> - - - + <!-- Profiles --> <profiles> <profile> @@ -266,12 +278,12 @@ </properties> </profile> </profiles> - + <!-- SCM and distribution management --> <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/build... <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> - + </project> Modified: root/commons/trunk/api/pom.xml =================================================================== --- root/commons/trunk/api/pom.xml 2010-05-12 17:42:44 UTC (rev 17005) +++ root/commons/trunk/api/pom.xml 2010-05-12 18:21:59 UTC (rev 17006) @@ -62,4 +62,14 @@ <scope>test</scope> </dependency> </dependencies> + + <build> + <!-- Trigger checkstyle for this build --> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: root/commons/trunk/bom/pom.xml =================================================================== --- root/commons/trunk/bom/pom.xml 2010-05-12 17:42:44 UTC (rev 17005) +++ root/commons/trunk/bom/pom.xml 2010-05-12 18:21:59 UTC (rev 17006) @@ -40,6 +40,7 @@ <url>http://www.jboss.org/richfaces</url> <properties> + <richfaces.bom.version>4.0.0-SNAPSHOT</richfaces.bom.version> </properties> <!-- Runtime dependency management --> @@ -48,7 +49,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>richfaces-bom</artifactId> - <version>${richfaces.version}</version> + <version>${richfaces.bom.version}</version> <scope>import</scope> <type>pom</type> </dependency> Added: root/commons/trunk/checkstyle-suppressions.xml =================================================================== --- root/commons/trunk/checkstyle-suppressions.xml (rev 0) +++ root/commons/trunk/checkstyle-suppressions.xml 2010-05-12 18:21:59 UTC (rev 17006) @@ -0,0 +1,28 @@ +<?xml version="1.0"?> + +<!DOCTYPE suppressions PUBLIC + "-//Puppy Crawl//DTD Suppressions 1.0//EN" + "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd"> + +<suppressions> + <suppress checks="DoubleCheckedLocking" files="MultipartRequestRegistry.java" /> + <suppress checks="FallThrough" files="JSMin.java" /> + <suppress checks="IllegalCatch" files="UISwitchablePanel.java" /> + <suppress checks="ModifiedControlVariable" files="MultipartRequest.java" /> + <suppress checks="IllegalCatch" files="StagingServer.java" /> + <suppress checks="IllegalCatch" files="PartialViewContextImpl.java" /> + <suppress checks="FallThrough" files="StagingServer.java" /> + <suppress checks="ModifiedControlVariable" files="Cookie.java" /> + <suppress checks="IllegalCatch" files="CacheManager.java" /> + <suppress checks="MissingSwitchDefault" files="JSONTokener.java" /> + <suppress checks="IllegalCatch" files="AjaxViewRoot.java" /> + <suppress checks="FallThrough" files="XMLTokener.java" /> + <suppress checks="IllegalCatch" files="ResourceHandlerImpl.java" /> + <suppress checks="IllegalThrows" files="AbstractThreadedTest.java" /> + <suppress checks="ModifiedControlVariable" files="URLCodec.java" /> + + <!-- TODO it is hot fix for building process, this files belong to the test-base module, + and must be removed from here --> + <suppress checks="IllegalCatch" files="AbstractThreadedTest.java" /> + <suppress checks="IllegalCatch" files="StagingServer.java" /> +</suppressions> Modified: root/commons/trunk/parent/pom.xml =================================================================== --- root/commons/trunk/parent/pom.xml 2010-05-12 17:42:44 UTC (rev 17005) +++ root/commons/trunk/parent/pom.xml 2010-05-12 18:21:59 UTC (rev 17006) @@ -1,3 +1,4 @@ + <!-- JBoss, Home of Professional Open Source Copyright 2010, Red Hat, Inc. and individual contributors by the @authors tag. See the @@ -35,11 +36,12 @@ <description> The Parent for all RichFaces Commons sub-projects. This specifies build and project meta-data. Runtime dependencies are imported via the bom. </description> - + <properties> <richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version> + <richfaces.checkstyle.version>4.0.0-SNAPSHOT</richfaces.checkstyle.version> </properties> - + <dependencyManagement> <dependencies> <dependency> @@ -49,7 +51,7 @@ <type>pom</type> <scope>import</scope> </dependency> - + <!-- Test Dependencies --> <dependency> <groupId>org.jboss.test-jsf</groupId> @@ -68,4 +70,38 @@ </dependency> </dependencies> </dependencyManagement> + + <build> + <pluginManagement> + <!-- Configure checkstyle plugin for commons --> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>checkstyle</artifactId> + <version>${richfaces.checkstyle.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> + </pluginManagement> + </build> </project> \ No newline at end of file Modified: root/core/trunk/bom/pom.xml =================================================================== --- root/core/trunk/bom/pom.xml 2010-05-12 17:42:44 UTC (rev 17005) +++ root/core/trunk/bom/pom.xml 2010-05-12 18:21:59 UTC (rev 17006) @@ -40,6 +40,7 @@ <properties> <richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version> + <richfaces.bom.version>4.0.0-SNAPSHOT</richfaces.bom.version> </properties> <!-- Runtime dependency management --> @@ -48,7 +49,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>richfaces-bom</artifactId> - <version>${richfaces.version}</version> + <version>${richfaces.bom.version}</version> <scope>import</scope> <type>pom</type> </dependency> Modified: root/core/trunk/impl/pom.xml =================================================================== --- root/core/trunk/impl/pom.xml 2010-05-12 17:42:44 UTC (rev 17005) +++ root/core/trunk/impl/pom.xml 2010-05-12 18:21:59 UTC (rev 17006) @@ -133,7 +133,6 @@ </dependencies> <build> - <!-- TODO centalize if possible - need to research --> <resources> <resource> <directory>src/main/resources</directory> @@ -142,6 +141,7 @@ <directory>target/javascript</directory> </resource> </resources> + <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -154,7 +154,10 @@ </execution> </executions> </plugin> + + <!-- The following plugins are specific to impl, and create, process, and document JavaScript resources --> <plugin> + <!-- Configure ant scripts to generate javascript --> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> @@ -178,6 +181,7 @@ </executions> </plugin> <plugin> + <!-- Configure csk maven plugin to process javascript --> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-javascript-plugin</artifactId> <executions> @@ -240,9 +244,9 @@ </executions> </plugin> <plugin> + <!-- Configure js documentation plugin --> <groupId>gr.abiss.mvn.plugins</groupId> <artifactId>maven-jstools-plugin</artifactId> - <version>0.7</version> <configuration> <jsDir>${basedir}/src/main/resources/Meta-inf/resources</jsDir> <includes>**/*.js</includes> @@ -261,7 +265,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.2</version> <configuration> <javadocVersion>1.5</javadocVersion> <aggregate>true</aggregate> @@ -277,9 +280,9 @@ </executions> </plugin> <plugin> + <!-- Configure JavaScript Doc Tool --> <groupId>gr.abiss.mvn.plugins</groupId> <artifactId>maven-jstools-plugin</artifactId> - <version>0.7</version> <executions> <execution> <id>jsdoc</id> Modified: root/core/trunk/pom.xml =================================================================== --- root/core/trunk/pom.xml 2010-05-12 17:42:44 UTC (rev 17005) +++ root/core/trunk/pom.xml 2010-05-12 18:21:59 UTC (rev 17006) @@ -44,76 +44,17 @@ <module>impl</module> </modules> - <dependencyManagement> - </dependencyManagement> - - <dependencies> - </dependencies> - <reporting> - <!-- TODO need to centralize this - but need to research --> <plugins> + <!-- TODO: want to centralize, need to research --> <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> - - <profiles> - <!-- TODO need to move this - but need to research --> - <profile> - <id>checkstyle</id> - <!-- - It is a clever way to skip checkstyle for a sonar. If - you want skip checkstyle add "fast" parametr (means add - "-Dfast" in command line) - --> - <activation> - <property> - <name>!fast</name> - </property> - </activation> - <build> - <plugins> - <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> - </profile> - - </profiles> </project>