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/04/18 11:57:16 UTC
[maven-site-plugin] branch open-issues updated: [MSITE-959] Incorrect assumption of default locale
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch open-issues
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
The following commit(s) were added to refs/heads/open-issues by this push:
new aca1ce20 [MSITE-959] Incorrect assumption of default locale
aca1ce20 is described below
commit aca1ce20c0cc654d2dbf81bd040720d1fe9e2806
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Apr 18 13:56:47 2023 +0200
[MSITE-959] Incorrect assumption of default locale
---
.../apache/maven/plugins/site/deploy/AbstractDeployMojo.java | 6 ++----
.../plugins/site/descriptor/AbstractSiteDescriptorMojo.java | 8 ++------
.../java/org/apache/maven/plugins/site/render/SiteMojo.java | 7 +++----
.../java/org/apache/maven/plugins/site/run/SiteRunMojo.java | 10 ++++------
4 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java b/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
index b932175a..b7f09031 100644
--- a/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
@@ -28,6 +28,7 @@ import java.util.Set;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.doxia.site.inheritance.URIPathDescriptor;
+import org.apache.maven.doxia.tools.SiteTool;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.DistributionManagement;
@@ -357,11 +358,8 @@ public abstract class AbstractDeployMojo extends AbstractSiteMojo implements Con
getLog().info("Pushing " + inputDirectory);
- // Default is first in the list
- final Locale defaultLocale = localesList.get(0);
-
for (Locale locale : localesList) {
- if (!locale.equals(defaultLocale)) {
+ if (!locale.equals(SiteTool.DEFAULT_LOCALE)) {
getLog().info(" >>> to " + appendSlash(repository.getUrl()) + locale + "/" + relativeDir);
wagon.putDirectory(new File(inputDirectory, locale.toString()), locale + "/" + relativeDir);
diff --git a/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java b/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java
index b72e0230..a2f3f62d 100644
--- a/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java
@@ -24,6 +24,7 @@ import java.util.Locale;
import org.apache.maven.doxia.site.SiteModel;
import org.apache.maven.doxia.site.inheritance.SiteModelInheritanceAssembler;
+import org.apache.maven.doxia.tools.SiteTool;
import org.apache.maven.doxia.tools.SiteToolException;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
@@ -100,13 +101,8 @@ public abstract class AbstractSiteDescriptorMojo extends AbstractSiteMojo {
if (url == null) {
getLog().warn("No project URL defined - site links will not be relativized!");
} else {
- List<Locale> localesList = getLocales();
-
- // Default is first in the list
- Locale defaultLocale = localesList.get(0);
-
// MSITE-658
- final String localeUrl = !locale.equals(defaultLocale) ? append(url, locale.toString()) : url;
+ final String localeUrl = !locale.equals(SiteTool.DEFAULT_LOCALE) ? append(url, locale.toString()) : url;
getLog().info("Relativizing site links with respect to localized project URL: " + localeUrl);
assembler.resolvePaths(siteModel, localeUrl);
diff --git a/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java b/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
index b1477eed..a49762b0 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
@@ -105,13 +105,12 @@ public class SiteMojo extends AbstractSiteRenderingMojo {
try {
List<Locale> localesList = getLocales();
- // Default is first in the list
- Locale defaultLocale = localesList.get(0);
-
for (Locale locale : localesList) {
getLog().info("Rendering site for "
+ buffer().strong(
- (!locale.equals(defaultLocale) ? "locale '" + locale + "'" : "default locale"))
+ (!locale.equals(SiteTool.DEFAULT_LOCALE)
+ ? "locale '" + locale + "'"
+ : "default locale"))
.toString());
renderLocale(locale, reports, localesList);
}
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 6d254bf1..5d7381a6 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
@@ -30,6 +30,7 @@ import java.util.Map;
import org.apache.maven.doxia.siterenderer.DocumentRenderer;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
+import org.apache.maven.doxia.tools.SiteTool;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
@@ -130,9 +131,6 @@ public class SiteRunMojo extends AbstractSiteRenderingMojo {
List<Locale> localesList = getLocales();
webapp.setAttribute(DoxiaFilter.LOCALES_LIST_KEY, localesList);
- // Default is first in the list
- Locale defaultLocale = localesList.get(0);
-
try {
Map<String, DoxiaBean> i18nDoxiaContexts = new HashMap<>();
@@ -147,20 +145,20 @@ public class SiteRunMojo extends AbstractSiteRenderingMojo {
i18nGeneratedSiteContext.getSiteDirectories().clear();
Map<String, DocumentRenderer> i18nDocuments = locateDocuments(i18nContext, reports, locale);
- if (!defaultLocale.equals(locale)) {
+ if (!locale.equals(SiteTool.DEFAULT_LOCALE)) {
i18nGeneratedSiteContext.addSiteDirectory(new File(generatedSiteDirectory, locale.toString()));
} else {
i18nGeneratedSiteContext.addSiteDirectory(generatedSiteDirectory);
}
DoxiaBean doxiaBean = new DoxiaBean(i18nContext, i18nDocuments, i18nGeneratedSiteContext);
- if (!defaultLocale.equals(locale)) {
+ if (!locale.equals(SiteTool.DEFAULT_LOCALE)) {
i18nDoxiaContexts.put(locale.toString(), doxiaBean);
} else {
i18nDoxiaContexts.put("default", doxiaBean);
}
- if (!defaultLocale.equals(locale)) {
+ if (!locale.equals(SiteTool.DEFAULT_LOCALE)) {
siteRenderer.copyResources(i18nContext, new File(tempWebappDirectory, locale.toString()));
} else {
siteRenderer.copyResources(i18nContext, tempWebappDirectory);