Repository navigation
Bring #209 and #211 into master - #212
Merged
Merged
Conversation
#209 (templates, categories and comments over AtomPub) and #211 (AtomPub reference guide) were merged into their stacked base branches after #210 was squash-merged into master, so their changes never reached master. This commit applies them: the tree is that of replace-propono-atompub at 95d2419, which is master plus #209 and #211.
mraible
added a commit
to mraible/roller
that referenced
this pull request
Oct 11, 2026
Master replaced ROME Propono with Roller's own StAX AtomPub server (apache#210, apache#212), which already includes apache#198's per-request webservices.enableAtomPub check, the entry size limit, hardened entry parsing, MediaTypePolicy headers on served media, and request-free temp file names. That server replaces the forked Propono servlet on this branch, so RollerAtomRequestImpl goes away and OAuth 1.0a stays removed from RollerAtomHandler, along with the OAuth sections of the AtomPub guide and security model. Everything new from master is moved to the jakarta.servlet namespace and Struts 7 APIs (ActionContext.of().bind(), withServletRequest and friends), and the ORM and persistence files keep their Jakarta schemas under master's new license headers.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#209 (templates, categories and comments over AtomPub) and #211 (AtomPub reference guide) were reviewed and merged into their stacked base branches, but #210 had already been squash-merged into
master, so their changes never reachedmaster.This PR applies them in one commit. Its tree equals
replace-propono-atompubat95d2419ea, which ismasterplus #209 and #211;masteritself equals #210's pre-squash head. No new code.mvn -pl app test: 534 tests, 0 failures.After merging, the leftover branches
replace-propono-atompub,atompub-templates-categories-commentsandatompub-reference-guidecan be deleted.