You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/04/17 10:48:23 UTC
[maven-site-plugin] 01/08: first shot
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 2b1e66731425f80dd5df7ebc1578ccf16ef161e2
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Feb 20 21:36:15 2022 +0100
first shot
---
pom.xml | 24 ++----------
.../site/render/AbstractSiteRenderingMojo.java | 45 ++++++++--------------
.../render/CategorySummaryDocumentRenderer.java | 8 +---
.../site/render/ReportDocumentRenderer.java | 3 --
.../apache/maven/plugins/site/run/DoxiaFilter.java | 2 +-
5 files changed, 20 insertions(+), 62 deletions(-)
diff --git a/pom.xml b/pom.xml
index d8afa459..58a0c670 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,10 +197,9 @@ under the License.
<properties>
<mavenVersion>3.2.5</mavenVersion>
<javaVersion>8</javaVersion>
-
<!-- for dependencies -->
- <doxiaVersion>1.11.1</doxiaVersion>
- <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
+ <doxiaVersion>2.0.0-M2</doxiaVersion>
+ <doxiaSitetoolsVersion>2.0.0-M2</doxiaSitetoolsVersion>
<jettyVersion>9.4.46.v20220331</jettyVersion>
<wagonVersion>3.5.1</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
@@ -372,24 +371,7 @@ under the License.
<version>${doxiaVersion}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-confluence</artifactId>
- <version>${doxiaVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-docbook-simple</artifactId>
- <version>${doxiaVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-twiki</artifactId>
- <version>${doxiaVersion}</version>
- <scope>runtime</scope>
- </dependency>
+
<!-- Doxia Sitetools -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
diff --git a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
index 3fceab25..a5308652 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
@@ -302,40 +302,25 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo
}
SiteRenderingContext context;
- if ( templateFile != null )
+ try
{
- getLog().info( buffer().a( "Rendering content with " ).strong( templateFile
- + " template file" ).a( '.' ).toString() );
+ Artifact skinArtifact =
+ siteTool.getSkinArtifactFromRepository( localRepository, repositories, decorationModel );
- if ( !templateFile.exists() )
- {
- throw new MojoFailureException( "Template file '" + templateFile + "' does not exist" );
- }
- context = siteRenderer.createContextForTemplate( templateFile, attributes, decorationModel,
- project.getName(), locale );
+ getLog().info( buffer().a( "Rendering content with " ).strong( skinArtifact.getId()
+ + " skin" ).a( '.' ).toString() );
+
+ context = siteRenderer.createContextForSkin( skinArtifact, attributes, decorationModel,
+ project.getName(), locale );
}
- else
+ catch ( SiteToolException e )
{
- try
- {
- Artifact skinArtifact =
- siteTool.getSkinArtifactFromRepository( localRepository, repositories, decorationModel );
-
- getLog().info( buffer().a( "Rendering content with " ).strong( skinArtifact.getId()
- + " skin" ).a( '.' ).toString() );
-
- context = siteRenderer.createContextForSkin( skinArtifact, attributes, decorationModel,
- project.getName(), locale );
- }
- catch ( SiteToolException e )
- {
- throw new MojoExecutionException( "SiteToolException while preparing skin: " + e.getMessage(), e );
- }
- catch ( RendererException e )
- {
- throw new MojoExecutionException( "RendererException while preparing context for skin: "
- + e.getMessage(), e );
- }
+ throw new MojoExecutionException( "SiteToolException while preparing skin: " + e.getMessage(), e );
+ }
+ catch ( RendererException e )
+ {
+ throw new MojoExecutionException( "RendererException while preparing context for skin: "
+ + e.getMessage(), e );
}
// Generate static site
diff --git a/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java b/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
index e2979f03..9c295a10 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
@@ -32,7 +32,6 @@ import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.RenderingContext;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
-import org.apache.maven.doxia.tools.MojoLogWrapper;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.reporting.MavenReport;
import org.codehaus.plexus.i18n.I18N;
@@ -82,11 +81,6 @@ public class CategorySummaryDocumentRenderer
{
SiteRendererSink sink = new SiteRendererSink( renderingContext );
- if ( log != null )
- {
- sink.enableLogging( new MojoLogWrapper( log ) );
- }
-
sink.head();
sink.title();
@@ -172,7 +166,7 @@ public class CategorySummaryDocumentRenderer
sink.close();
- renderer.generateDocument( writer, sink, siteRenderingContext );
+ renderer.mergeDocumentIntoSite( writer, sink, siteRenderingContext );
}
public String getOutputName()
diff --git a/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java b/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
index 45cf613f..40cf3ad0 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
@@ -40,7 +40,6 @@ import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.RenderingContext;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
-import org.apache.maven.doxia.tools.MojoLogWrapper;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.reporting.MavenMultiPageReport;
import org.apache.maven.reporting.MavenReport;
@@ -280,8 +279,6 @@ public class ReportDocumentRenderer
for ( MultiPageSubSink mySink : sinks )
{
- mySink.enableLogging( new MojoLogWrapper( log ) );
-
outputName = mySink.getOutputName();
log.debug( " Rendering " + outputName );
diff --git a/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java b/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java
index 7c698969..012ae187 100644
--- a/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java
+++ b/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java
@@ -177,7 +177,7 @@ public class DoxiaFilter
try
{
Map<String, DocumentRenderer> locateDocuments =
- siteRenderer.locateDocumentFiles( generatedSiteContext );
+ siteRenderer.locateDocumentFiles( generatedSiteContext, false );
if ( locateDocuments.containsKey( path ) )
{