This is an automated email from the ASF dual-hosted git repository.
jsedding pushed a change to branch resolver-2.x
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
from eb593ec [maven-release-plugin] prepare for next development iteration
add c750faa SLING-12608 : Implement Jakarta Servlet based Sling API (#52)
add 91d12fa SLING-12726 Update to Parent 62
add f161436 SLING-12726 apply spotless formatting
add 4a958a9 SLING-12726 ignore spotless code reformatting commit in git
blame
add f0ea057 SLING-12729 Integration tests fail with Java 21 (#57)
add d3092c9 SLING-12599 : Make dependency to Apache Felix HC optional
add 9696a2b SLING-12599 : Make dependency to Apache Felix HC optional
add e131b06 SLING-12752 : Support Jakarta Servlet 6.1
add 736091c SLING-12643 : Support Jakarta ServletAPI in Scripting
(Initial support)
add 3b528cd SLING-12643 : Support Jakarta ServletAPI in Scripting
(Initial support)
add b80d47f SLING-12643 : Support Jakarta ServletAPI in Scripting
(Initial support)
add d846b38 SLING-12643 : Support Jakarta ServletAPI in Scripting
(Initial support)
add 8411498 SLING-12433 fix concurrency issue when registering servlets
(#59)
add 7b672d1 SLING-12643 : Support Jakarta ServletAPI in Scripting
add c0fc2a6 SLING-12866 - Restrict force pushes, auto-delete branches on
merge
add ab24eae SLING-13016 - RequestWrapper causes NPEs when serving bundled
scripts if 'forceResourceType' is not set (#61)
add f1e9138 SLING-13027 Add Jakarta JSON dependency (#62)
add 41a5f33 SLING-13091 Expose information about wrapped servlets
add 3b7e1e0 SLING-13133 listChildren must be streaming (#64)
add d1751bc chore(deps): upgrade sling-bundle-parent to version 66 (#65)
add f5ae04a docs: add AGENTS.md, CLAUDE.md, and expand README (#66)
add 044960d docs: update AGENTS.md and README.md with new API, structure,
and test details (#67)
add ec5553a Add security section to AGENTS.md
add daa5076 SLING-13261 fix race condition on servlet resolution (#68)
add d393463 SLING-13262 avoid inconsistent state with concurrent
registrations (#70)
add 62754ac SLING-13266 avoid race on shutdown (#71)
add 8a7689c SLING-13272 fix javadoc warnings (#72)
add 877209f SLING-13292 - Support ranking of bundles contributing bundled
scripts (#73)
new 4855c0a Merge pull request #76 from apache/resolver-2.x-backports
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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(-)
create mode 100644 .git-blame-ignore-revs
create mode 100644 .sling-module.json
create mode 100644 AGENTS.md
create mode 100644 CLAUDE.md
create mode 100644
src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTrackerHC.java
create mode 100644
src/test/java/org/apache/sling/servlets/resolver/internal/ResolutionCacheRaceConditionTest.java
create mode 100644
src/test/java/org/apache/sling/servlets/resolver/internal/bundle/BundledRenderUnitCapabilityImplTest.java
copy
src/test/java/org/apache/sling/servlets/resolver/internal/bundle/{BundledScriptTrackerTest.java
=> BundledScriptTrackerHCTest.java} (54%)
create mode 100644
src/test/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTrackerRaceConditionTest.java
create mode 100644
src/test/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptsRankingHeaderTest.java
create mode 100644
src/test/java/org/apache/sling/servlets/resolver/internal/resource/MergingServletResourceProviderTest.java
copy
src/test/java/org/apache/sling/servlets/resolver/it/{TestServiceUserValidator.java
=> ScriptEngineManagerMock.java} (75%)
