You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2010/09/04 17:40:20 UTC
svn commit: r992626 - in
/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site:
AbstractSiteRenderingMojo.java DefaultMavenReportExecutor.java
SiteRunMojo.java wagon/PathUtils.java
Author: olamy
Date: Sat Sep 4 15:40:19 2010
New Revision: 992626
URL: http://svn.apache.org/viewvc?rev=992626&view=rev
Log:
fix checkstyle issues.
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=992626&r1=992625&r2=992626&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Sat Sep 4 15:40:19 2010
@@ -355,7 +355,7 @@ public abstract class AbstractSiteRender
Map<String, DocumentRenderer> documents, Locale locale )
{
// copy Collection to prevent ConcurrentModificationException
- List<MavenReportExecution> filtered = new ArrayList<MavenReportExecution>(reports);
+ List<MavenReportExecution> filtered = new ArrayList<MavenReportExecution>( reports );
Map<String, MavenReport> reportsByOutputName = new HashMap<String, MavenReport>();
for ( MavenReportExecution mavenReportExecution : filtered )
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java?rev=992626&r1=992625&r2=992626&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java Sat Sep 4 15:40:19 2010
@@ -27,6 +27,7 @@ import java.util.Set;
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryRequest;
+import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.model.Plugin;
@@ -159,7 +160,8 @@ public class DefaultMavenReportExecutor
List<RemoteRepository> remoteRepositories = session.getCurrentProject().getRemotePluginRepositories();
- PluginDescriptor pluginDescriptor = mavenPluginManager.getPluginDescriptor(plugin, remoteRepositories , session.getRepositorySession());
+ PluginDescriptor pluginDescriptor = mavenPluginManager
+ .getPluginDescriptor( plugin, remoteRepositories, session.getRepositorySession() );
if ( reportPlugin.getReportSets().isEmpty() && reportPlugin.getReports().isEmpty() )
{
@@ -171,14 +173,14 @@ public class DefaultMavenReportExecutor
}
else
{
- if (reportPlugin.getReportSets() != null)
+ if ( reportPlugin.getReportSets() != null )
{
for ( ReportSet reportSet : reportPlugin.getReportSets() )
{
goals.addAll( reportSet.getReports() );
}
}
- if (!reportPlugin.getReports().isEmpty())
+ if ( !reportPlugin.getReports().isEmpty() )
{
goals.addAll( reportPlugin.getReports() );
}
@@ -469,11 +471,10 @@ public class DefaultMavenReportExecutor
logger.warn( "" );
logger.warn( "For this reason, future Maven versions might no"
+ " longer support building such malformed projects." );
- logger.warn( "" );
- Plugin plugin = new Plugin();
- plugin.setGroupId( reportPlugin.getGroupId() );
- plugin.setArtifactId( reportPlugin.getArtifactId() );
+ Plugin plugin = new Plugin();
+ plugin.setGroupId( reportPlugin.getGroupId() );
+ plugin.setArtifactId( reportPlugin.getArtifactId() );
PluginVersionRequest pluginVersionRequest = new DefaultPluginVersionRequest( plugin , mavenReportExecutorRequest.getMavenSession() );
//pluginVersionRequest.setOffline( mavenReportExecutorRequest.getMavenSession().getRequest().isOffline() );
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java?rev=992626&r1=992625&r2=992626&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java Sat Sep 4 15:40:19 2010
@@ -147,7 +147,7 @@ public class SiteRunMojo
webapp.setContextPath( "/" );
webapp.setResourceBase( tempWebappDirectory.getAbsolutePath() );
webapp.setAttribute( DoxiaFilter.SITE_RENDERER_KEY, siteRenderer );
- webapp.getInitParams().put( "org.mortbay.jetty.servlet.Default.useFileMappedBuffer", "false" );
+ webapp.getInitParams().put( "org.mortbay.jetty.servlet.Default.useFileMappedBuffer", "false" );
// For external reports
project.getReporting().setOutputDirectory( tempWebappDirectory.getAbsolutePath() );
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java?rev=992626&r1=992625&r2=992626&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java Sat Sep 4 15:40:19 2010
@@ -374,7 +374,8 @@ public final class PathUtils
else
{
int index = url.indexOf( "://" );
- if( index != -1 ) {
+ if ( index != -1 )
+ {
pos = index + 3;
}
}