You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ba...@apache.org on 2007/02/02 09:08:49 UTC
svn commit: r502531 - in /maven/plugins/trunk/maven-checkstyle-plugin: ./
src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
src/site/apt/examples/suppressions-filter.apt
Author: baerrach
Date: Fri Feb 2 00:08:48 2007
New Revision: 502531
URL: http://svn.apache.org/viewvc?view=rev&rev=502531
Log:
[MCHECKSTYLE-67]
Updated
* documentation
* plugin documentation
* set default-value for suppressionsFileExpression
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/ (props changed)
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/suppressions-filter.apt
Propchange: maven/plugins/trunk/maven-checkstyle-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 2 00:08:48 2007
@@ -1,7 +1,10 @@
-.wtpmodules
-.classpath
-.project
-target
-*.iml
-*.ipr
-*.iws
+.wtpmodules
+.classpath
+.project
+target
+*.iml
+*.ipr
+*.iws
+.settings
+.externalToolBuilders
+maven-eclipse.xml
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?view=diff&rev=502531&r1=502530&r2=502531
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java Fri Feb 2 00:08:48 2007
@@ -287,6 +287,11 @@
* <code>${project.build.directory}/checkstyle-supressions.xml</code>
* file before being passed to checkstyle for loading.</p>
*
+ * <p>
+ * See <code>suppressionsFileExpression</code> for the property that will be made available
+ * to your checkstyle configuration.
+ * </p>
+ *
* @parameter expression="${checkstyle.suppressions.location}"
* @since 2.0-beta-2
*/
@@ -296,6 +301,7 @@
* The key to be used in the properties for the suppressions file.
*
* @parameter expression="${checkstyle.suppression.expression}"
+ * default-value="checkstyle.suppressions.file"
* @since 2.1
*/
private String suppressionsFileExpression;
@@ -477,7 +483,7 @@
{
return siteRenderer;
}
-
+
/**
* @see org.apache.maven.reporting.AbstractMavenReport#executeReport(java.util.Locale)
*/
@@ -963,7 +969,7 @@
try
{
File configFile = locator.resolveLocation( configLocation, "checkstyle-checker.xml" );
-
+
if ( configFile == null )
{
throw new MavenReportException( "Unable to process null config location." );
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/suppressions-filter.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/suppressions-filter.apt?view=diff&rev=502531&r1=502530&r2=502531
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/suppressions-filter.apt (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/suppressions-filter.apt Fri Feb 2 00:08:48 2007
@@ -60,6 +60,7 @@
<configuration>
<configLocation>checkstyle.xml</configLocation>
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+ <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
</configuration>
</plugin>
</plugins>