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/02/20 20:36:23 UTC
[maven-site-plugin] branch doxia-2.0.0 created (now 6067509)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git.
at 6067509 first shot
This branch includes the following new commits:
new 6067509 first shot
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-site-plugin] 01/01: first shot
Posted by mi...@apache.org.
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 60675095baad021e997e8729c2a223ea71d36925
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Feb 20 21:36:15 2022 +0100
first shot
---
pom.xml | 26 ++-----------
.../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, 21 insertions(+), 63 deletions(-)
diff --git a/pom.xml b/pom.xml
index 69d4d6e..28f118a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,11 +195,11 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>3.0.5</mavenVersion>
- <javaVersion>7</javaVersion>
+ <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.2.29.v20191105</jettyVersion>
<plexusVersion>1.5.4</plexusVersion>
<scmVersion>1.4</scmVersion>
@@ -366,24 +366,6 @@ 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>
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 16398c8..071d8a4 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
@@ -300,40 +300,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 e2979f0..9c295a1 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 45cf613..40cf3ad 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 7c69896..012ae18 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 ) )
{