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

mraible pushed a commit to branch roller-6.1.x
in repository https://gitbox.apache.org/repos/asf/roller.git

commit 49f5cf770f9c274f09d7fcc15ea59e106122fd19
Merge: 638e60a87 32304dd3b
Author: Matt Raible <[email protected]>
AuthorDate: Thu Nov 19 17:52:52 2026 -0700

    Merge pull request #337 from apache/absolute-url-from-config-6.1.x
    
    Take the site URL from setup or an administrator, not from the first request

 .../planet/business/MultiPlanetURLStrategy.java    |   2 +-
 .../business/plugins/entry/SmileysPlugin.java      |  23 +-
 .../weblogger/config/WebloggerRuntimeConfig.java   | 254 +++++++++++++++++++--
 .../planet/business/PlanetURLStrategy.java         |   2 +-
 .../planet/business/WebloggerRomeFeedFetcher.java  |  24 ++
 .../weblogger/planet/tasks/SyncWebsitesTask.java   |  10 +
 .../weblogger/planet/ui/PlanetGroupSubs.java       |   4 +-
 .../weblogger/ui/core/filters/InitFilter.java      | 111 ++++-----
 .../ui/rendering/util/cache/PlanetCache.java       |  10 +-
 .../ui/rendering/util/cache/SiteWideCache.java     |   9 +-
 .../rendering/util/cache/WeblogCacheWarmupJob.java |   8 +
 .../ui/rendering/util/cache/WeblogFeedCache.java   |  10 +-
 .../ui/rendering/util/cache/WeblogPageCache.java   |  10 +-
 .../roller/weblogger/ui/struts2/core/Install.java  |  41 +++-
 .../roller/weblogger/ui/struts2/core/Register.java |  45 +++-
 .../ui/struts2/util/UIActionInterceptor.java       |   6 +
 .../org/apache/roller/weblogger/util/MailUtil.java |  99 +++++---
 .../main/resources/ApplicationResources.properties |   6 +
 .../weblogger/business/PlanetManagerLocalTest.java |  22 +-
 .../roller/weblogger/business/PropertiesTest.java  |  56 +++++
 .../plugins/entry/SmileysPluginSiteUrlTest.java    |  91 ++++++++
 .../weblogger/config/SiteUrlForAdminTest.java      | 168 ++++++++++++++
 .../weblogger/config/SiteUrlWhileUnsetTest.java    | 171 ++++++++++++++
 .../planet/business/PlanetSiteUrlTest.java         | 125 ++++++++++
 .../weblogger/ui/core/filters/InitFilterTest.java  | 203 +++++++++++++---
 .../weblogger/ui/struts2/core/InstallTest.java     |  59 +++++
 .../ui/struts2/core/RegisterSiteUrlTest.java       | 204 +++++++++++++++++
 .../roller/weblogger/util/MailUtilSiteUrlTest.java | 240 +++++++++++++++++++
 28 files changed, 1853 insertions(+), 160 deletions(-)


Reply via email to