Skip to content

Allow to give alternative source directories for sites#1261

Merged
kwin merged 1 commit intomasterfrom
feature/configurablesourcedirectories-newmaster
Apr 18, 2026
Merged

Allow to give alternative source directories for sites#1261
kwin merged 1 commit intomasterfrom
feature/configurablesourcedirectories-newmaster

Conversation

@kwin
Copy link
Copy Markdown
Member

@kwin kwin commented Apr 9, 2026

This relates to
apache/maven-doxia-sitetools#277

Following this checklist to help us incorporate your
contribution quickly and easily:

  • Your pull request should address just one issue, without pulling in other changes.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Each commit in the pull request should have a meaningful subject line and body.
    Note that commits might be squashed by a maintainer on merge.
  • Write unit tests that match behavioral changes, where the tests fail if the changes to the runtime are not applied.
    This may not always be possible but is a best-practice.
  • Run mvn verify to make sure basic checks pass.
    A more thorough check will be performed on your pull request automatically.
  • You have run the integration tests successfully (mvn -Prun-its verify).

If your pull request is about ~20 lines of code you don't need to sign an
Individual Contributor License Agreement if you are unsure
please ask on the developers list.

To make clear that you license your contribution under
the Apache License Version 2.0, January 2004
you have to acknowledge this by using the following check-box.

@kwin kwin force-pushed the feature/configurablesourcedirectories-newmaster branch 2 times, most recently from a6e4143 to 6701331 Compare April 11, 2026 11:00
@kwin kwin marked this pull request as ready for review April 13, 2026 10:03
@kwin kwin requested review from hboutemy and michael-o April 13, 2026 10:04
docRenderingContext.getExtension(),
docRenderingContext.isEditable(),
docRenderingContext.getGenerator());
docRenderingContext.getBasedir(), document, docRenderingContext.getGenerator());
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happended to the rest?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All other arguments are null or false anyhow for report generated documents, please look at the javadoc of the constructors.

mainSiteDirectory.addAlternativeEditableSourceDirectory(additionalSiteSourceDirectory);
}
}
context.addSiteDirectory(mainSiteDirectory);
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How is the locale cleanly retained?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you clarify what is the concern here? The site directory just got an additional field (locale is not touched).

@kwin kwin force-pushed the feature/configurablesourcedirectories-newmaster branch 2 times, most recently from ac56c00 to d2518d0 Compare April 17, 2026 12:16
Copy link
Copy Markdown
Member

@olamy olamy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@kwin kwin force-pushed the feature/configurablesourcedirectories-newmaster branch from d2518d0 to 3aa5590 Compare April 18, 2026 09:35
@kwin kwin force-pushed the feature/configurablesourcedirectories-newmaster branch from 3aa5590 to 78196e9 Compare April 18, 2026 09:37
@kwin kwin merged commit 1b3cff6 into master Apr 18, 2026
4 of 5 checks passed
@kwin kwin deleted the feature/configurablesourcedirectories-newmaster branch April 18, 2026 09:38
@github-actions
Copy link
Copy Markdown

@kwin Please assign appropriate label to PR according to the type of change.

@github-actions github-actions Bot added this to the 3.21.1 milestone Apr 18, 2026
@kwin kwin added the enhancement New feature or request label Apr 18, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants