Author: hboutemy
Date: Sun Jan 18 16:41:01 2015
New Revision: 1652790
URL: http://svn.apache.org/r1652790
Log:
use injected log
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutorRequest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java?rev=1652790&r1=1652789&r2=1652790&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java
Sun Jan 18 16:41:01 2015
@@ -70,7 +70,7 @@ public class CheckstyleAggregateReport
.setResourceIncludes( resourceIncludes )
.setResourceExcludes( resourceExcludes )
.setIncludeTestSourceDirectory( includeTestSourceDirectory
).setListener( getListener() )
- .setLog( getLog() ).setProject( project ).setSourceDirectories(
getSourceDirectories() )
+ .setProject( project ).setSourceDirectories(
getSourceDirectories() )
.setResources( resources ).setTestResources( testResources )
.setStringOutputStream( stringOutputStream
).setSuppressionsLocation( suppressionsLocation )
.setTestSourceDirectories( getTestSourceDirectories()
).setConfigLocation( configLocation )
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?rev=1652790&r1=1652789&r2=1652790&view=diff
==============================================================================
---
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
Sun Jan 18 16:41:01 2015
@@ -170,7 +170,7 @@ public class CheckstyleReport
.setIncludeResources( includeResources )
.setIncludeTestResources( includeTestResources )
.setIncludeTestSourceDirectory( includeTestSourceDirectory
).setListener( getListener() )
- .setLog( getLog() ).setProject( project ).setSourceDirectories(
getSourceDirectories() )
+ .setProject( project ).setSourceDirectories(
getSourceDirectories() )
.setResources( resources )
.setStringOutputStream( stringOutputStream
).setSuppressionsLocation( suppressionsLocation )
.setTestSourceDirectories( getTestSourceDirectories()
).setConfigLocation( configLocation )
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java?rev=1652790&r1=1652789&r2=1652790&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
Sun Jan 18 16:41:01 2015
@@ -520,7 +520,7 @@ public class CheckstyleViolationCheckMoj
.setIncludeResources( includeResources )
.setIncludeTestResources( includeTestResources )
.setIncludeTestSourceDirectory( includeTestSourceDirectory
).setListener( getListener() )
- .setLog( getLog() ).setProject( project
).setSourceDirectories( getSourceDirectories() )
+ .setProject( project ).setSourceDirectories(
getSourceDirectories() )
.setResources( resources )
.setStringOutputStream( stringOutputStream
).setSuppressionsLocation( suppressionsLocation )
.setTestSourceDirectories( getTestSourceDirectories()
).setConfigLocation( configLocation )
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutorRequest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutorRequest.java?rev=1652790&r1=1652789&r2=1652790&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutorRequest.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutorRequest.java
Sun Jan 18 16:41:01 2015
@@ -27,7 +27,6 @@ import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
import com.puppycrawl.tools.checkstyle.DefaultLogger;
@@ -63,8 +62,6 @@ public class CheckstyleExecutorRequest
private MavenProject project;
- private Log log;
-
private String suppressionsLocation;
private boolean includeTestSourceDirectory;
@@ -195,17 +192,6 @@ public class CheckstyleExecutorRequest
return this;
}
- public Log getLog()
- {
- return log;
- }
-
- public CheckstyleExecutorRequest setLog( Log log )
- {
- this.log = log;
- return this;
- }
-
public String getSuppressionsLocation()
{
return suppressionsLocation;
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java?rev=1652790&r1=1652789&r2=1652790&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java
Sun Jan 18 16:41:01 2015
@@ -187,9 +187,8 @@ public class DefaultCheckstyleExecutor
if ( outputDirectoryFile.exists() )
{
URL outputDirectoryUrl = outputDirectoryFile.toURL();
- request.getLog().debug(
- "Adding the outputDirectory "
+ outputDirectoryUrl.toString()
- + " to the Checkstyle
class path" );
+ getLogger().debug( "Adding the outputDirectory " +
outputDirectoryUrl.toString()
+ + " to the Checkstyle class
path" );
urls.add( outputDirectoryUrl );
}
}
@@ -274,7 +273,7 @@ public class DefaultCheckstyleExecutor
if ( message.length() > 0 )
{
- request.getLog().info( message );
+ getLogger().info( message );
}
}
@@ -291,7 +290,7 @@ public class DefaultCheckstyleExecutor
}
else
{
- request.getLog().info( message );
+ getLogger().info( message );
}
}
@@ -361,9 +360,8 @@ public class DefaultCheckstyleExecutor
if ( StringUtils.isEmpty( request.getEncoding() ) )
{
- request.getLog().warn(
- "File encoding has not been set, using
platform encoding " + effectiveEncoding
- + ", i.e. build is platform
dependent!" );
+ getLogger().warn( "File encoding has not been set, using
platform encoding " + effectiveEncoding
+ + ", i.e. build is platform dependent!"
);
}
if ( "Checker".equals( config.getName() )
@@ -387,7 +385,7 @@ public class DefaultCheckstyleExecutor
}
else
{
- request.getLog().warn( "Failed to configure file encoding
on module " + config );
+ getLogger().warn( "Failed to configure file encoding on
module " + config );
}
}
Configuration[] modules = config.getChildren();
@@ -416,7 +414,7 @@ public class DefaultCheckstyleExecutor
}
else
{
- request.getLog().warn( "Failed to configure cache file
on module " + module );
+ getLogger().warn( "Failed to configure cache file on
module " + module );
}
}
}
