You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2010/06/14 00:12:47 UTC
svn commit: r954324 -
/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/
Author: hboutemy
Date: Sun Jun 13 22:12:47 2010
New Revision: 954324
URL: http://svn.apache.org/viewvc?rev=954324&view=rev
Log:
fixed code formatting
Modified:
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/MavenReportExecution.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/MavenReportExecutor.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java
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=954324&r1=954323&r2=954324&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 Sun Jun 13 22:12:47 2010
@@ -55,7 +55,7 @@ import org.codehaus.plexus.util.xml.Xpp3
import org.mortbay.log.Log;
/**
- *
+ *
* @author Olivier Lamy
* @since 3.0-beta-1
*/
@@ -72,35 +72,34 @@ public class DefaultMavenReportExecutor
@Requirement
protected LifecycleExecutor lifecycleExecutor;
-
+
@Requirement
protected PluginVersionResolver pluginVersionResolver;
-
+
public List<MavenReportExecution> buildMavenReports( MavenReportExecutorRequest mavenReportExecutorRequest )
throws MojoExecutionException
{
-
- if (getLog().isDebugEnabled())
+ if ( getLog().isDebugEnabled() )
{
getLog().debug( "buildMavenReports" );
}
List<String> imports = new ArrayList<String>();
-
+
imports.add( "org.apache.maven.reporting.MavenReport" );
imports.add( "org.apache.maven.doxia.siterenderer.Renderer" );
imports.add( "org.apache.maven.doxia.sink.SinkFactory" );
imports.add( "org.codehaus.doxia.sink.Sink" );
imports.add( "org.apache.maven.doxia.sink.Sink" );
imports.add( "org.apache.maven.doxia.sink.SinkEventAttributes" );
-
+
Set<String> excludes = new HashSet<String>( 1 );
//excludes.add( "maven-reporting-impl");
excludes.add( "doxia-site-renderer" );
excludes.add( "doxia-sink-api" );
-
- ExclusionSetFilter exclusionSetFilter = new ExclusionSetFilter(excludes);
-
+
+ ExclusionSetFilter exclusionSetFilter = new ExclusionSetFilter( excludes );
+
RepositoryRequest repositoryRequest = new DefaultRepositoryRequest();
repositoryRequest.setLocalRepository( mavenReportExecutorRequest.getLocalRepository() );
repositoryRequest.setRemoteRepositories( mavenReportExecutorRequest.getProject().getPluginArtifactRepositories() );
@@ -115,17 +114,18 @@ public class DefaultMavenReportExecutor
Plugin plugin = new Plugin();
plugin.setGroupId( reportPlugin.getGroupId() );
plugin.setArtifactId( reportPlugin.getArtifactId() );
- plugin.setVersion( getPluginVersion (reportPlugin, repositoryRequest, mavenReportExecutorRequest ) );
+ plugin.setVersion( getPluginVersion( reportPlugin, repositoryRequest, mavenReportExecutorRequest ) );
- if (logger.isInfoEnabled())
+ if ( logger.isInfoEnabled() )
{
- logger.info( "configuring reportPlugin " + plugin.getGroupId() + ":" + plugin.getArtifactId() + ":" + plugin.getVersion() );
+ logger.info( "configuring reportPlugin " + plugin.getGroupId() + ":" + plugin.getArtifactId() + ":"
+ + plugin.getVersion() );
}
-
+
List<String> goals = new ArrayList<String>();
PluginDescriptor pluginDescriptor = mavenPluginManager.getPluginDescriptor( plugin, repositoryRequest );
-
+
if ( reportPlugin.getReportSets().isEmpty() )
{
List<MojoDescriptor> mojoDescriptors = pluginDescriptor.getMojos();
@@ -157,10 +157,11 @@ public class DefaultMavenReportExecutor
mojoExecution.setMojoDescriptor( mojoDescriptor );
-
+
mavenPluginManager.setupPluginRealm( pluginDescriptor,
mavenReportExecutorRequest.getMavenSession(),
- Thread.currentThread().getContextClassLoader(), imports, exclusionSetFilter );
+ Thread.currentThread().getContextClassLoader(), imports,
+ exclusionSetFilter );
MavenReport mavenReport =
getConfiguredMavenReport( mojoExecution, pluginDescriptor, mavenReportExecutorRequest );
@@ -176,7 +177,7 @@ public class DefaultMavenReportExecutor
Xpp3Dom mergedConfiguration =
Xpp3DomUtils.mergeXpp3Dom( reportConfiguration, convert( mojoDescriptor ) );
-
+
Xpp3Dom cleanedConfiguration = new Xpp3Dom( "configuration" );
if ( mergedConfiguration.getChildren() != null )
{
@@ -194,7 +195,7 @@ public class DefaultMavenReportExecutor
getLog().debug( "mojoExecution mergedConfiguration " + mergedConfiguration );
getLog().debug( "mojoExecution cleanedConfiguration " + cleanedConfiguration );
}
-
+
mojoExecution.setConfiguration( cleanedConfiguration );
}
@@ -228,9 +229,8 @@ public class DefaultMavenReportExecutor
}
}
- private boolean canGenerateReport(MavenReport mavenReport)
+ private boolean canGenerateReport( MavenReport mavenReport )
{
-
try
{
return mavenReport.canGenerateReport();
@@ -245,10 +245,10 @@ public class DefaultMavenReportExecutor
"Error loading report " + mavenReport.getClass().getName()
+ " - AbstractMethodError: canGenerateReport()" );
return true;
- }
-
+ }
+
}
-
+
private MavenReport getConfiguredMavenReport( MojoExecution mojoExecution, PluginDescriptor pluginDescriptor,
MavenReportExecutorRequest mavenReportExecutorRequest )
throws PluginContainerException, PluginConfigurationException
@@ -265,7 +265,7 @@ public class DefaultMavenReportExecutor
{
return null;
}
- mavenReport = (MavenReport) mojo;
+ mavenReport = (MavenReport) mojo;
return mavenReport;
}
@@ -274,17 +274,18 @@ public class DefaultMavenReportExecutor
getLog().warn( "skip ClassCastException " + e.getMessage() );
return null;
}
- catch (PluginContainerException e )
+ catch ( PluginContainerException e )
{
/**
* ignore old plugin which are using removed PluginRegistry
* [INFO] Caused by: java.lang.NoClassDefFoundError: org/apache/maven/plugin/registry/PluginRegistry
*/
- if ( e.getCause() != null && e.getCause() instanceof NoClassDefFoundError && e.getMessage().contains( "PluginRegistry" ) )
+ if ( e.getCause() != null && e.getCause() instanceof NoClassDefFoundError
+ && e.getMessage().contains( "PluginRegistry" ) )
{
getLog().warn( "skip NoClassDefFoundError with PluginRegistry " );
// too noisy only in debug mode + e.getMessage() );
- if (getLog().isDebugEnabled())
+ if ( getLog().isDebugEnabled() )
{
Log.debug( e.getMessage(), e );
}
@@ -366,7 +367,7 @@ public class DefaultMavenReportExecutor
{
return logger;
}
-
+
protected String getPluginVersion( ReportPlugin reportPlugin, RepositoryRequest repositoryRequest, MavenReportExecutorRequest mavenReportExecutorRequest )
throws PluginVersionResolutionException
{
@@ -378,23 +379,23 @@ public class DefaultMavenReportExecutor
{
return reportPlugin.getVersion();
}
-
+
MavenProject project = mavenReportExecutorRequest.getProject();
-
+
// search in the build section
if ( project.getBuild() != null )
{
Plugin plugin = find( reportPlugin.getGroupId(), reportPlugin.getArtifactId(), project.getBuild().getPlugins() );
- if (plugin != null && plugin.getVersion() != null)
+ if ( plugin != null && plugin.getVersion() != null )
{
- if (getLog().isDebugEnabled())
+ if ( getLog().isDebugEnabled() )
{
logger.debug( "resolve version from the build.plugins section " + plugin.getVersion() );
}
return plugin.getVersion();
}
}
-
+
// search in pluginMngt section
if ( project.getBuild() != null && project.getBuild().getPluginManagement() != null )
{
@@ -409,9 +410,9 @@ public class DefaultMavenReportExecutor
}
return plugin.getVersion();
}
- }
-
-
+ }
+
+
logger.warn( "report plugin " + reportPlugin.getGroupId() + ":" + reportPlugin.getArtifactId()
+ " has an empty version" );
logger.warn( "" );
@@ -424,9 +425,9 @@ public class DefaultMavenReportExecutor
PluginVersionRequest pluginVersionRequest = new DefaultPluginVersionRequest( repositoryRequest );
pluginVersionRequest.setOffline( mavenReportExecutorRequest.getMavenSession().getRequest().isOffline() );
-
+
pluginVersionRequest.setForceUpdate( mavenReportExecutorRequest.getMavenSession().getRequest().isUpdateSnapshots() );
-
+
pluginVersionRequest.setGroupId( reportPlugin.getGroupId() );
pluginVersionRequest.setArtifactId( reportPlugin.getArtifactId() );
PluginVersionResult result = pluginVersionResolver.resolve( pluginVersionRequest );
@@ -438,7 +439,7 @@ public class DefaultMavenReportExecutor
}
return result.getVersion();
}
-
+
private Plugin find( String groupId, String artifactId, List<Plugin> plugins )
{
if ( plugins == null )
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/MavenReportExecution.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/MavenReportExecution.java?rev=954324&r1=954323&r2=954324&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/MavenReportExecution.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/MavenReportExecution.java Sun Jun 13 22:12:47 2010
@@ -22,7 +22,7 @@ package org.apache.maven.plugins.site;
import org.apache.maven.reporting.MavenReport;
/**
- *
+ *
* @author Olivier Lamy
* @since 3.0-beta-1
*/
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/MavenReportExecutor.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/MavenReportExecutor.java?rev=954324&r1=954323&r2=954324&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/MavenReportExecutor.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/MavenReportExecutor.java Sun Jun 13 22:12:47 2010
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.maven.plugin.MojoExecutionException;
/**
- *
+ *
* @author Olivier Lamy
* @since 3.0-beta-1
*/
@@ -35,6 +35,6 @@ public interface MavenReportExecutor
* @return
* @throws MojoExecutionException
*/
- List<MavenReportExecution> buildMavenReports(MavenReportExecutorRequest mavenReportExecutorRequest)
+ List<MavenReportExecution> buildMavenReports( MavenReportExecutorRequest mavenReportExecutorRequest )
throws MojoExecutionException;
}
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java?rev=954324&r1=954323&r2=954324&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java Sun Jun 13 22:12:47 2010
@@ -58,7 +58,7 @@ public class ReportDocumentRenderer
private Log log;
- public ReportDocumentRenderer( MavenReportExecution mavenReportExecution, RenderingContext renderingContext, Log log)
+ public ReportDocumentRenderer( MavenReportExecution mavenReportExecution, RenderingContext renderingContext, Log log )
{
this.mavenReportExecution = mavenReportExecution;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java?rev=954324&r1=954323&r2=954324&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java Sun Jun 13 22:12:47 2010
@@ -187,7 +187,7 @@ public class SiteDeployMojo
{
throw new MojoExecutionException( "Unable to configure Wagon: '" + repository.getProtocol() + "'", e );
}
-
+
if ( !wagon.supportsDirectoryCopy() )
{
@@ -215,11 +215,11 @@ public class SiteDeployMojo
wagon.connect( repository, wagonManager.getAuthenticationInfo( id ) );
}
*/
-
+
wagon.connect( repository );
-
+
wagon.putDirectory( inputDirectory, "." );
-
+
if ( chmod && wagon instanceof CommandExecutor )
{
CommandExecutor exec = (CommandExecutor) wagon;
@@ -326,7 +326,7 @@ public class SiteDeployMojo
return null;
}
}
-
+
return proxyInfo;
*/
}
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java?rev=954324&r1=954323&r2=954324&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java Sun Jun 13 22:12:47 2010
@@ -125,6 +125,5 @@ public class SiteDescriptorArtifactMetad
public void merge( org.apache.maven.repository.legacy.metadata.ArtifactMetadata metadata )
{
// FIXME what todo here ?
-
}
}