(maven-site-plugin) 01/01: Foo

[michaelo]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MSITE-1006
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git

commit 4c160ac59504f08ec3fad736816b3022f0807262
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Thu Apr 18 21:02:42 2024 +0200

    Foo
---
 .../apache/maven/plugins/site/render/SiteMojo.java | 23 +++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

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 7b261ac7..bd264d45 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
@@ -125,12 +125,6 @@ public class SiteMojo extends AbstractSiteRenderingMojo {
             throws IOException, RendererException, MojoFailureException, 
MojoExecutionException {
         SiteRenderingContext context = createSiteRenderingContext(locale);
         context.addSiteLocales(supportedLocales);
-        if (!locale.equals(SiteTool.DEFAULT_LOCALE)) {
-            context.addSiteDirectory(new File(generatedSiteDirectory, 
locale.toString()));
-        } else {
-            context.addSiteDirectory(generatedSiteDirectory);
-        }
-
         context.setInputEncoding(getInputEncoding());
         context.setOutputEncoding(getOutputEncoding());
         context.setValidate(validate);
@@ -138,18 +132,15 @@ public class SiteMojo extends AbstractSiteRenderingMojo {
             getLog().info("Validation is switched on, xml input documents will 
be validated!");
         }
 
+        // 1.1 locate editable Doxia documents first
         Map<String, DocumentRenderer> documents = locateDocuments(context, 
reports, locale);
 
-        // copy resources
+        // 1.2 copy resources
         siteRenderer.copyResources(context, outputDirectory);
 
-        // 1. render Doxia documents first
+        // 1.3 render editable Doxia documents first
         List<DocumentRenderer> nonDoxiaDocuments = 
renderDoxiaDocuments(documents, context, outputDirectory, false);
 
-        // 2. then non-Doxia documents (e.g., reports)
-        renderNonDoxiaDocuments(nonDoxiaDocuments, context, outputDirectory);
-
-        // 3. Generated docs must be (re-)done afterwards as they are often 
generated by reports
         context.getSiteDirectories().clear();
         if (!locale.equals(SiteTool.DEFAULT_LOCALE)) {
             context.addSiteDirectory(new File(generatedSiteDirectory, 
locale.toString()));
@@ -157,13 +148,17 @@ public class SiteMojo extends AbstractSiteRenderingMojo {
             context.addSiteDirectory(generatedSiteDirectory);
         }
 
+        // 2.1 locate generated (non-editable) Doxia documents
         Map<String, DocumentRenderer> generatedDocuments =
                 siteRenderer.locateDocumentFiles(context, false /* not 
editable */);
 
+        // 2.2 copy generated resources also
+        siteRenderer.copyResources(context, outputDirectory);
+        // 2.3 render generated (non-editable) Doxia documents
         renderDoxiaDocuments(generatedDocuments, context, outputDirectory, 
true);
 
-        // copy generated resources also
-        siteRenderer.copyResources(context, outputDirectory);
+        // 3 then non-Doxia documents (e.g. reports)
+        renderNonDoxiaDocuments(nonDoxiaDocuments, context, outputDirectory);
     }
 
     /**