You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2011/03/06 09:23:58 UTC
svn commit: r1078420 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/main/java/org/apache/maven/plugins/site/
Author: ltheussl
Date: Sun Mar 6 08:23:58 2011
New Revision: 1078420
URL: http://svn.apache.org/viewvc?rev=1078420&view=rev
Log:
merge r1066038 from trunk
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
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/SiteDeployMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 6 08:23:58 2011
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=1078420&r1=1078419&r2=1078420&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java Sun Mar 6 08:23:58 2011
@@ -20,19 +20,14 @@ package org.apache.maven.plugins.site;
*/
import java.io.File;
-import java.util.Iterator;
+
import java.util.List;
-import java.util.Locale;
-import java.util.Map;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.doxia.site.decoration.DecorationModel;
-import org.apache.maven.doxia.site.decoration.Menu;
-import org.apache.maven.doxia.site.decoration.MenuItem;
import org.apache.maven.doxia.tools.SiteTool;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.reporting.MavenReport;
+
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.ReaderFactory;
@@ -132,50 +127,6 @@ public abstract class AbstractSiteMojo
return ( outputEncoding == null ) ? ReaderFactory.UTF_8 : outputEncoding;
}
- protected void populateReportItems( DecorationModel decorationModel, Locale locale,
- Map<String, MavenReport> reportsByOutputName )
- {
- for ( Iterator<Menu> i = decorationModel.getMenus().iterator(); i.hasNext(); )
- {
- Menu menu = i.next();
-
- populateItemRefs( menu.getItems(), locale, reportsByOutputName );
- }
- }
-
- private void populateItemRefs( List<MenuItem> items, Locale locale, Map<String, MavenReport> reportsByOutputName )
- {
- for ( Iterator<MenuItem> i = items.iterator(); i.hasNext(); )
- {
- MenuItem item = i.next();
-
- if ( item.getRef() != null )
- {
- MavenReport report = reportsByOutputName.get( item.getRef() );
-
- if ( report != null )
- {
-
- if ( item.getName() == null )
- {
- item.setName( report.getName( locale ) );
- }
-
- if ( item.getHref() == null || item.getHref().length() == 0 )
- {
- item.setHref( report.getOutputName() + ".html" );
- }
- }
- else
- {
- getLog().warn( "Unrecognised reference: '" + item.getRef() + "'" );
- i.remove();
- }
- }
- populateItemRefs( item.getItems(), locale, reportsByOutputName );
- }
- }
-
/**
* TODO should be removed see PLXUTILS-61
*
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=1078420&r1=1078419&r2=1078420&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 Sun Mar 6 08:23:58 2011
@@ -19,20 +19,12 @@ package org.apache.maven.plugins.site;
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.doxia.sink.render.RenderingContext;
import org.apache.maven.doxia.site.decoration.DecorationModel;
+import org.apache.maven.doxia.site.decoration.Menu;
+import org.apache.maven.doxia.site.decoration.MenuItem;
import org.apache.maven.doxia.siterenderer.DocumentRenderer;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.doxia.siterenderer.RendererException;
@@ -43,6 +35,17 @@ import org.apache.maven.plugin.MojoExecu
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.reporting.MavenReport;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
/**
* Base class for site rendering mojos.
*
@@ -402,4 +405,49 @@ public abstract class AbstractSiteRender
}
return documents;
}
+
+ protected void populateReportItems( DecorationModel decorationModel, Locale locale,
+ Map<String, MavenReport> reportsByOutputName )
+ {
+ for ( Iterator<Menu> i = decorationModel.getMenus().iterator(); i.hasNext(); )
+ {
+ Menu menu = i.next();
+
+ populateItemRefs( menu.getItems(), locale, reportsByOutputName );
+ }
+ }
+
+ private void populateItemRefs( List<MenuItem> items, Locale locale, Map<String, MavenReport> reportsByOutputName )
+ {
+ for ( Iterator<MenuItem> i = items.iterator(); i.hasNext(); )
+ {
+ MenuItem item = i.next();
+
+ if ( item.getRef() != null )
+ {
+ MavenReport report = reportsByOutputName.get( item.getRef() );
+
+ if ( report != null )
+ {
+
+ if ( item.getName() == null )
+ {
+ item.setName( report.getName( locale ) );
+ }
+
+ if ( item.getHref() == null || item.getHref().length() == 0 )
+ {
+ item.setHref( report.getOutputName() + ".html" );
+ }
+ }
+ else
+ {
+ getLog().warn( "Unrecognised reference: '" + item.getRef() + "'" );
+ i.remove();
+ }
+ }
+
+ populateItemRefs( item.getItems(), locale, reportsByOutputName );
+ }
+ }
}
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=1078420&r1=1078419&r2=1078420&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 Mar 6 08:23:58 2011
@@ -26,7 +26,6 @@ import org.apache.maven.execution.MavenE
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Site;
-import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
@@ -83,7 +82,7 @@ import java.util.List;
* @goal deploy
*/
public class SiteDeployMojo
- extends AbstractMojo
+ extends AbstractSiteMojo
{
/**
* Directory containing the generated project sites and report distributions.
@@ -121,13 +120,6 @@ public class SiteDeployMojo
private String chmodOptions;
/**
- * @parameter expression="${project}"
- * @required
- * @readonly
- */
- protected MavenProject project;
-
- /**
* @component
*/
private WagonManager wagonManager;
@@ -503,6 +495,32 @@ public class SiteDeployMojo
}
}
+ /**
+ * Find the top level parent in the reactor, i.e. the execution root.
+ *
+ * @param reactorProjects The projects in the reactor. May be null in which case null is returnned.
+ * @return The top level project in the reactor, or <code>null</code> if none can be found
+ *
+ * @since 2.3
+ */
+ protected static MavenProject getTopLevelProject( List<MavenProject> reactorProjects )
+ {
+ if ( reactorProjects == null )
+ {
+ return null;
+ }
+
+ for ( MavenProject reactorProject : reactorProjects )
+ {
+ if ( reactorProject.isExecutionRoot() )
+ {
+ return reactorProject;
+ }
+ }
+
+ return null;
+ }
+
private static Site getSite( final MavenProject project )
throws MojoExecutionException
{
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=1078420&r1=1078419&r2=1078420&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java Sun Mar 6 08:23:58 2011
@@ -19,7 +19,6 @@ package org.apache.maven.plugins.site;
* under the License.
*/
-import org.apache.maven.doxia.tools.SiteTool;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
@@ -73,14 +72,6 @@ public class SiteStageDeployMojo
private String stagingRepositoryId;
/**
- * SiteTool.
- *
- * @component
- * @since 2.3
- */
- private SiteTool siteTool;
-
- /**
* The current user system settings for use in Maven.
*
* @parameter expression="${settings}"
@@ -102,6 +93,7 @@ public class SiteStageDeployMojo
/**
* {@inheritDoc}
*/
+ @Override
public void execute()
throws MojoExecutionException
{
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java?rev=1078420&r1=1078419&r2=1078420&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java Sun Mar 6 08:23:58 2011
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.site;
*/
import java.io.File;
+
import java.util.List;
import org.apache.maven.model.Site;
@@ -27,6 +28,7 @@ import org.apache.maven.plugin.MojoExecu
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.plugins.site.wagon.repository.Repository;
+
import org.codehaus.plexus.util.StringUtils;
/**
@@ -58,18 +60,9 @@ public class SiteStageMojo
protected File stagingDirectory;
/**
- * The reactor projects.
- *
- * @parameter default-value="${reactorProjects}"
- * @required
- * @readonly
- * @since 2.3
- */
- protected List<MavenProject> reactorProjects;
-
- /**
* @see org.apache.maven.plugin.Mojo#execute()
*/
+ @Override
public void execute()
throws MojoExecutionException
{
@@ -145,30 +138,6 @@ public class SiteStageMojo
}
/**
- * Find the top level parent in the reactor, i.e. the execution root.
- *
- * @param reactorProjects The projects in the reactor
- * @return The top level project in the reactor, or <code>null</code> if none can be found
- */
- protected MavenProject getTopLevelProject( List<MavenProject> reactorProjects )
- {
- MavenProject topLevelProject = null;
- if ( reactorProjects != null )
- {
- for ( MavenProject reactorProject : reactorProjects )
- {
- if ( reactorProject.isExecutionRoot() )
- {
- getLog().debug( "isExecutionRoot " + reactorProject.getName() );
- topLevelProject = reactorProject;
- }
- }
- }
- getLog().debug( "topLevelProject is null" );
- return topLevelProject;
- }
-
- /**
* Generates the site structure using the project hiearchy (project and its modules) or using the
* distributionManagement elements from the pom.xml.
*