You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by pa...@apache.org on 2020/04/29 08:26:32 UTC

[sling-org-apache-sling-servlets-resolver] branch issues/SLING-9365 updated (4085489 -> e57ab42)

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

pauls pushed a change to branch issues/SLING-9365
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git.


    from 4085489  SLING-9365: add merging resource provider for servlets.
     add e57ab42  SLING-9365: optionally use internal resource provider for servlets.

No new revisions were added by this update.

Summary of changes:
 .../sling/servlets/resolver/internal/ResolverConfig.java    |  8 ++++----
 .../servlets/resolver/internal/ScriptResourceDecorator.java |  2 +-
 .../servlets/resolver/internal/ScriptResourceResolver.java  | 13 +++++++------
 .../internal/resource/MergingServletResourceProvider.java   | 11 ++++-------
 .../servlets/resolver/internal/resource/ServletMounter.java |  2 +-
 5 files changed, 17 insertions(+), 19 deletions(-)