This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch retire-incoming-trackback in repository https://gitbox.apache.org/repos/asf/roller.git
commit 7f6effad1fa40b1b828461f581086a83810a05b4 Merge: d76c2379e bca0ac011 Author: David M. Johnson <[email protected]> AuthorDate: Sat Sep 5 19:33:21 2026 -0400 Merge incoming trackback retirement onto current master 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 .../roller/weblogger/pojos/WeblogEntryComment.java | 8 + .../pojos/wrapper/WeblogEntryCommentWrapper.java | 9 +- .../ui/rendering/WeblogRequestMapper.java | 48 +-- .../weblogger/ui/rendering/model/ConfigModel.java | 6 - .../weblogger/ui/rendering/model/URLModel.java | 15 +- .../TrackbackLinkbackCommentValidator.java | 63 +--- .../ui/rendering/servlets/CommentServlet.java | 26 +- .../ui/rendering/servlets/TrackbackServlet.java | 258 -------------- .../ui/rendering/util/WeblogTrackbackRequest.java | 205 ----------- .../weblogger/util/BannedwordslistChecker.java | 14 +- .../roller/weblogger/util/CommentAuthorUrl.java | 113 ++++++ .../roller/weblogger/util/LinkbackExtractor.java | 393 --------------------- .../main/resources/ApplicationResources.properties | 11 +- .../resources/ApplicationResources_de.properties | 7 +- .../resources/ApplicationResources_es.properties | 4 +- .../resources/ApplicationResources_fr.properties | 9 +- .../resources/ApplicationResources_ja.properties | 7 +- .../resources/ApplicationResources_ko.properties | 7 +- .../resources/ApplicationResources_ru.properties | 3 +- .../ApplicationResources_zh_CN.properties | 7 +- .../roller/weblogger/config/roller.properties | 7 +- .../roller/weblogger/config/runtimeConfigDefs.xml | 15 +- .../main/webapp/WEB-INF/jsps/editor/Comments.jsp | 14 +- app/src/main/webapp/WEB-INF/velocity/weblog.vm | 28 +- app/src/main/webapp/WEB-INF/web.xml | 14 +- app/src/main/webapp/robots.txt | 3 +- app/src/main/webapp/themes/base.css | 2 +- app/src/main/webapp/themes/basic/_day.vm | 1 - app/src/main/webapp/themes/basicmobile/_day.vm | 1 - .../wrapper/WeblogEntryCommentWrapperTest.java | 72 ++++ .../ui/rendering/IncomingTrackbackRemovalTest.java | 101 ++++++ .../weblogger/util/LinkbackExtractorTest.java | 52 --- docs/examples/configs/tomcat/mod_jk.conf | 1 - docs/roller-template-guide.adoc | 18 - docs/roller-user-guide.adoc | 43 +-- 35 files changed, 391 insertions(+), 1194 deletions(-)
