Retire incoming Trackback support and normalize comment links - #178
Merged
Conversation
# Conflicts: # app/src/main/resources/ApplicationResources_fr.properties # app/src/main/resources/ApplicationResources_ja.properties # app/src/main/resources/ApplicationResources_ko.properties # app/src/main/resources/ApplicationResources_zh_CN.properties # app/src/main/webapp/themes/base.css
Brings the work from the incoming-trackback-retirement branch onto master. It had been merged into the stacked entry-trackback-cleanup branch rather than master, so it never reached the default branch. The branch predates several changes that have since landed, so the conflicts resolve to master wherever master is newer: the Mediacast imports in EntryEdit stay removed, and the locale files keep master's trailing whitespace. Two resolve the other way: the comment link in Comments.jsp uses the escaped safe URL this branch introduces, and base.css takes the branch's line ending, which restores the file-wide CRLF that a single line on master had lost. Claude-Session: https://claude.ai/code/session_019R1jdtwkaYEeA6L9DXEtEi
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.
Retires incoming Trackback and tidies how comment links are rendered.
Trackback is long obsolete: the ping endpoint attracts essentially nothing but spam, and the code behind it is some of the least exercised in the tree. Removing it deletes a public unauthenticated endpoint and the request plumbing that fed it, rather than continuing to carry code nobody uses.
Changes
TrackbackServletandWeblogTrackbackRequest, and unmap the servlet fromweb.xml.TrackbackLinkbackCommentValidatoras an inert validator so existing configurations that name it keep starting, with test coverage pinning that behaviour.Note on provenance
This is the same work as #176, which was opened against the stacked
entry-trackback-cleanupbranch and merged there rather than intomaster, so it never reached the default branch. Rather than reopen that PR against a base that is now behind, this branches from currentmaster.Conflicts and how they were resolved
The original branch predates several changes that have since landed, so seven files conflicted. Resolved to
masterwherevermasteris newer:EntryEdit.java— the Mediacast imports stay removed (they went with the enclosure change).ApplicationResources_{fr,ja,ko,zh_CN}.properties— trailing blank lines only; kept master's.Resolved the other way where this branch is the newer intent:
Comments.jsp— uses the escaped safe URL this branch introduces.base.css— takes this branch's line ending, which restores the file-wide CRLF that one line on master had lost.Verification
Full suite on JDK 11: 297 tests, 0 failures, 0 errors, 1 skipped, including
IncomingTrackbackRemovalTest(3).Confirmed after the merge that the newer work already on master is intact — the enclosure change's import removal, the entry authorization guard, and the delegated enclosure listener — and that
TrackbackServletandWeblogTrackbackRequestare gone with no remainingweb.xmlreferences.https://claude.ai/code/session_019R1jdtwkaYEeA6L9DXEtEi