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 2023/12/14 11:35:34 UTC
(maven-site-plugin) branch fixes created (now 81191969)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch fixes
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
at 81191969 Use consistent setter approach
This branch includes the following new commits:
new 54882574 [MSITE-997] Non-localized site directory DocumentRenderingContext passed
new 81191969 Use consistent setter approach
The 2 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/02: [MSITE-997] Non-localized site directory DocumentRenderingContext passed
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch fixes
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 5488257469544228e8476b4ef8757faa8ab94b5c
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Dec 14 12:12:19 2023 +0100
[MSITE-997] Non-localized site directory DocumentRenderingContext passed
---
.../site/render/AbstractSiteRenderingMojo.java | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
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 90f60165..630515ff 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
@@ -367,11 +367,17 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo
getLog().info("Skipped \"" + report.getName(locale) + "\" report" + reportMojoInfo + ", file \""
+ filename + "\" already exists.");
} else {
+ File localizedSiteDirectory;
+ if (!locale.equals(SiteTool.DEFAULT_LOCALE)) {
+ localizedSiteDirectory = new File(siteDirectory, locale.toString());
+ } else {
+ localizedSiteDirectory = siteDirectory;
+ }
String generator = mavenReportExecution.getGoal() == null
? null
: mavenReportExecution.getPlugin().getId() + ':' + mavenReportExecution.getGoal();
DocumentRenderingContext docRenderingContext =
- new DocumentRenderingContext(siteDirectory, outputName, generator);
+ new DocumentRenderingContext(localizedSiteDirectory, outputName, generator);
DocumentRenderer docRenderer =
new ReportDocumentRenderer(mavenReportExecution, docRenderingContext, getLog());
documents.put(filename, docRenderer);
@@ -428,13 +434,20 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo
siteTool.populateReportsMenu(context.getSiteModel(), locale, categories);
populateReportItems(context.getSiteModel(), locale, reportsByOutputName);
+ File localizedSiteDirectory;
+ if (!locale.equals(SiteTool.DEFAULT_LOCALE)) {
+ localizedSiteDirectory = new File(siteDirectory, locale.toString());
+ } else {
+ localizedSiteDirectory = siteDirectory;
+ }
+
if (categories.containsKey(MavenReport.CATEGORY_PROJECT_INFORMATION) && generateProjectInfo) {
// add "Project Information" category summary document
List<MavenReport> categoryReports = categories.get(MavenReport.CATEGORY_PROJECT_INFORMATION);
MojoExecution subMojoExecution =
new MojoExecution(mojoExecution.getPlugin(), "project-info", mojoExecution.getExecutionId());
DocumentRenderingContext docRenderingContext = new DocumentRenderingContext(
- siteDirectory,
+ localizedSiteDirectory,
subMojoExecution.getGoal(),
subMojoExecution.getPlugin().getId() + ':' + subMojoExecution.getGoal());
String title = i18n.getString("site-plugin", locale, "report.information.title");
@@ -457,7 +470,7 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo
MojoExecution subMojoExecution =
new MojoExecution(mojoExecution.getPlugin(), "project-reports", mojoExecution.getExecutionId());
DocumentRenderingContext docRenderingContext = new DocumentRenderingContext(
- siteDirectory,
+ localizedSiteDirectory,
subMojoExecution.getGoal(),
subMojoExecution.getPlugin().getId() + ':' + subMojoExecution.getGoal());
String title = i18n.getString("site-plugin", locale, "report.project.title");
@@ -478,7 +491,7 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo
MojoExecution subMojoExecution =
new MojoExecution(mojoExecution.getPlugin(), "sitemap", mojoExecution.getExecutionId());
DocumentRenderingContext docRenderingContext = new DocumentRenderingContext(
- siteDirectory,
+ localizedSiteDirectory,
subMojoExecution.getGoal(),
subMojoExecution.getPlugin().getId() + ':' + subMojoExecution.getGoal());
String title = i18n.getString("site-plugin", locale, "site.sitemap.title");
(maven-site-plugin) 02/02: Use consistent setter approach
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch fixes
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 81191969d82f088d406ab185574c22cfae08d62c
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Dec 13 21:46:24 2023 +0100
Use consistent setter approach
---
src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java b/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
index 5d7381a6..7e6649e4 100644
--- a/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
@@ -37,6 +37,7 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.site.render.AbstractSiteRenderingMojo;
+import org.apache.maven.reporting.MavenReport;
import org.apache.maven.reporting.exec.MavenReportExecution;
import org.codehaus.plexus.util.IOUtil;
import org.eclipse.jetty.server.Server;
@@ -122,7 +123,8 @@ public class SiteRunMojo extends AbstractSiteRenderingMojo {
// For external reports
project.getReporting().setOutputDirectory(tempWebappDirectory.getAbsolutePath());
for (MavenReportExecution mavenReportExecution : getReports()) {
- mavenReportExecution.getMavenReport().setReportOutputDirectory(tempWebappDirectory);
+ MavenReport report = mavenReportExecution.getMavenReport();
+ report.setReportOutputDirectory(tempWebappDirectory);
}
List<MavenReportExecution> reports =