This is an automated email from the ASF dual-hosted git repository. jsedding pushed a commit to branch resolver-2.x in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
commit 4855c0abbcae8c525a4de09b9f98d11227603522 Merge: eb593ec 877209f Author: Julian Sedding <[email protected]> AuthorDate: Wed Aug 19 11:29:00 2026 +0200 Merge pull request #76 from apache/resolver-2.x-backports Resolver 2.x backports .asf.yaml | 4 + .git-blame-ignore-revs | 1 + .sling-module.json | 5 + AGENTS.md | 108 +++ CLAUDE.md | 1 + README.md | 59 +- bnd.bnd | 3 + pom.xml | 322 +++++---- .../api/IgnoredServletResourcePredicate.java | 9 +- .../sling/servlets/resolver/api/package-info.java | 1 + .../internal/HandleErrorResponseWriter.java | 1 - .../HandleErrorSlingHttpServletResponse.java | 1 - .../internal/PathBasedServletAcceptor.java | 88 ++- .../servlets/resolver/internal/ResolverConfig.java | 82 ++- .../servlets/resolver/internal/ScriptResource.java | 33 +- .../resolver/internal/ScriptResourceDecorator.java | 66 +- .../resolver/internal/ScriptResourceResolver.java | 119 ++-- .../resolver/internal/SlingScriptResolverImpl.java | 31 +- .../resolver/internal/SlingServletResolver.java | 343 +++++----- .../resolver/internal/bundle/BundledHooks.java | 56 +- .../bundle/BundledRenderUnitCapabilityImpl.java | 159 +++-- .../internal/bundle/BundledScriptServlet.java | 75 +-- .../internal/bundle/BundledScriptTracker.java | 746 +++++++++++---------- .../internal/bundle/BundledScriptTrackerHC.java | 137 ++++ .../resolver/internal/bundle/RequestWrapper.java | 47 +- .../resolver/internal/bundle/TypeProviderImpl.java | 46 +- .../internal/console/WebConsolePlugin.java | 253 +++---- .../defaults/DefaultErrorHandlerServlet.java | 99 +-- .../resolver/internal/defaults/DefaultServlet.java | 14 +- .../internal/helper/AbstractResourceCollector.java | 107 +-- .../internal/helper/LocationCollector.java | 235 ++++--- .../helper/NamedScriptResourceCollector.java | 75 ++- .../internal/helper/ResourceCollector.java | 241 +++---- .../internal/helper/SearchPathProvider.java | 6 +- .../resolver/internal/helper/WeightedResource.java | 12 +- .../internal/resolution/ResolutionCache.java | 134 ++-- .../resource/MergingServletResourceProvider.java | 221 ++++-- .../resolver/internal/resource/ServletMounter.java | 153 +++-- .../internal/resource/ServletResource.java | 38 +- .../internal/resource/ServletResourceProvider.java | 24 +- .../resource/ServletResourceProviderFactory.java | 143 ++-- .../internal/resource/SlingServletConfig.java | 30 +- .../jmx/SlingServletResolverCacheMBean.java | 1 - .../sling/servlets/resolver/jmx/package-info.java | 3 - .../internal/AbsoluteResourceTypeTest.java | 204 +++--- .../HandleErrorSlingHttpServletResponseTest.java | 7 +- .../internal/PathBasedServletAcceptorTest.java | 181 +++-- .../internal/ResolutionCacheRaceConditionTest.java | 273 ++++++++ .../resolver/internal/ScriptResourceTest.java | 58 +- .../internal/SecureRequestsOptingServletTest.java | 78 ++- .../internal/SlingServletResolverTest.java | 8 +- .../internal/SlingServletResolverTestBase.java | 20 +- .../resolver/internal/bundle/BundledHooksTest.java | 42 +- .../BundledRenderUnitCapabilityImplTest.java | 163 +++++ ...erTest.java => BundledScriptTrackerHCTest.java} | 45 +- .../BundledScriptTrackerRaceConditionTest.java | 209 ++++++ .../internal/bundle/BundledScriptTrackerTest.java | 487 +++++++++++++- .../bundle/BundledScriptsRankingHeaderTest.java | 84 +++ .../internal/console/DecomposedURLTest.java | 54 +- .../internal/console/WebConsolePluginTest.java | 224 ++++--- .../defaults/DefaultErrorHandlerServletTest.java | 119 ++-- .../helper/AbstractResourceCollectorTest.java | 73 +- .../resolver/internal/helper/HelperTestBase.java | 76 ++- .../internal/helper/IsSameResourceList.java | 70 +- .../internal/helper/LocationCollectorTest.java | 628 ++++++++--------- .../internal/helper/ResourceCollectorTest.java | 498 +++++++------- .../internal/helper/ScriptSelection2Test.java | 239 ++++--- .../internal/helper/ScriptSelectionTest.java | 177 ++--- .../internal/helper/WeightedResourceTest.java | 27 +- .../MergingServletResourceProviderTest.java | 340 ++++++++++ .../internal/resource/MockServletResource.java | 11 +- .../internal/resource/ServletMounterTest.java | 42 +- .../ServletResourceProviderCreateTest.java | 168 ++--- .../internal/resourcehiding/ServletHidingTest.java | 30 +- .../sling/servlets/resolver/it/SLING10478IT.java | 76 ++- ...Validator.java => ScriptEngineManagerMock.java} | 15 +- .../resolver/it/ServletResolverTestSupport.java | 244 ++++--- .../servlets/resolver/it/ServletResourceIT.java | 82 ++- .../servlets/resolver/it/ServletSelectionIT.java | 110 ++- .../servlets/resolver/it/TestResourceProvider.java | 33 +- .../resolver/it/TestServiceUserValidator.java | 5 +- .../sling/servlets/resolver/it/TestServlet.java | 10 +- .../it/resourcehiding/BasicResourceHidingIT.java | 6 +- .../it/resourcehiding/HiddenServletFallbackIT.java | 6 +- .../resolver/it/resourcehiding/NoHidingIT.java | 4 +- .../it/resourcehiding/ResourceHidingITBase.java | 36 +- 86 files changed, 5944 insertions(+), 3650 deletions(-)
